2025.04.22 审批未通过优化

src/main/java/com/xujie/sys/modules/auth/service/AuthRuleService.java

@@ -27,4 +27,6 @@ public interface AuthRuleService extends IService<AuthRuleData> {
     List<AuthRuleDataVo> getBusinessTypeList(AuthRuleDataVo data);
 
     void getFormAuthRule(String recordType,String site,String buNo,String quoteNo) throws MessagingException, UnsupportedEncodingException;
+
+    Boolean deleteAuthHistByRfqNo(String recordType, String site, String buNo, String rfqNo);
 }

src/main/java/com/xujie/sys/modules/auth/service/impl/AuthRuleServiceImpl.java

@@ -148,7 +148,7 @@ public class AuthRuleServiceImpl extends ServiceImpl<AuthRuleMapper, AuthRuleDat
                 }
 
                 authHistData.setApproveResult("未审批");
-                    authHistService.saveAuthHist(authHistData);
+                authHistService.saveAuthHist(authHistData);
 
                 if (authHistData.getCanAuthFlag().equals("Y")){
                     List<Integer> userIds = authRuleMapper.getUserIdByAuthGroup(authHistData);
@@ -168,6 +168,17 @@ public class AuthRuleServiceImpl extends ServiceImpl<AuthRuleMapper, AuthRuleDat
         authHistService.authMailSend(authMailSends);
     }
 
+    // 审批未通过时下达后删除原有审批信息
+    @Override
+    public Boolean deleteAuthHistByRfqNo(String recordType, String site, String buNo, String rfqNo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("record_type_db", recordType);
+        map.put("site", site);
+        map.put("order_ref2", buNo);
+        map.put("order_ref1", rfqNo);
+        return authHistService.removeByMap(map);
+    }
+
 }
 
 

src/main/java/com/xujie/sys/modules/inquiry/service/impl/InquiryApplicationServiceImpl.java

@@ -18,6 +18,7 @@ import com.xujie.sys.modules.quote.entity.QuoteDetailBom;
 import com.xujie.sys.modules.quote.mapper.QuoteDetailBomMapper;
 import com.xujie.sys.modules.quote.mapper.QuoteMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -219,12 +220,20 @@ public class InquiryApplicationServiceImpl extends ServiceImpl<InquiryApplicatio
             throw new RuntimeException("在当前Site及BU下 " + data.getBu() + " ，存在相同的询价单号！");
         }
         data.setUpdateDate(new Date());
+        data.setVisible("Y");
 
         // 拿到询价单状态
         InquiryApplicationData inquiryApplicationData = inquiryApplicationMapper.selectById(data.getId());
-        if (inquiryApplicationData.getStatus().equals("C")){
+        if (inquiryApplicationData.getStatus().equals("C") || inquiryApplicationData.getVisible().equals("N")) {
+            if (inquiryApplicationData.getVisible().equals("N")){
+                Boolean flag = authRuleService.deleteAuthHistByRfqNo("2",data.getSite(), data.getBuNo(),
+                        data.getRfqNo());
+                if (!flag) {
+                    throw new RuntimeException("审批历史删除失败！");
+                }
+            }
             // 审批规则
-            authRuleService.getFormAuthRule("2",data.getSite(),data.getBuNo(),data.getRfqNo());
+            authRuleService.getFormAuthRule("2" ,data.getSite(),data.getBuNo(),data.getRfqNo());
         }
 
         // 更新询价单

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

@@ -900,8 +900,15 @@ public class EamProjectServiceImpl implements EamProjectService {
      **/
     @Override
     public void sendEmail() throws MessagingException, UnsupportedEncodingException {
+        List<String> siteList = new ArrayList<>();
+        siteList.add("2");
+        siteList.add("3");
+
         // 从存储过程获取所有待发送邮件数据
-        List<ProofDocumentData> allUserSendEmailList = EamProjectMapper.getAutoSendMailAddress("2");
+        List<ProofDocumentData> allUserSendEmailList = new ArrayList<>();
+        for (int i = 0; i < siteList.size(); i++) {
+           allUserSendEmailList.addAll(EamProjectMapper.getAutoSendMailAddress(siteList.get(i)));
+        }
         List<ProofDocumentData> oneUserSendEmailList = new ArrayList<>();
         String previousUsername = null;