Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -245,6 +245,13 @@ public class ChangeFlowBiz {
             return flowId;
         }
         // todo: 变更发起人≠变更负责人，到达501节点，发送邮件，变更申请
+        qcSendEmail(changeCommander, changeRecord);
+        // 如果是供应商，再次发送供应商邮件
+
+        return flowId;
+    }
+
+    private void qcSendEmail(String changeCommander, ChangeRecord changeRecord) {
         IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
         iusDepartmentReq.setHasOrgPos(true);
         iusDepartmentReq.setIcac(true);
@@ -264,7 +271,6 @@ public class ChangeFlowBiz {
         param.put("flowUrl", "工单链接");
         iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param,
             EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, Collections.singletonList(changeRecord.getId().toString()));
-        return flowId;
     }
 
     private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files, Integer type) {

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeRecordMapper.xml

@@ -45,6 +45,7 @@
         select <include refid="Base_Column_List" />
         from TB_YX_QC_CHANGE_RECORD
         <where>
+            create_source = #{createSource}
             <if test="itemId != null ">
                 and change_item like concat('%',#{itemId},'%')
             </if>

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java

@@ -9,7 +9,10 @@ package com.netease.mail.yanxuan.change.web.controller;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,6 +25,7 @@ import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
 import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
+import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.QueryCommanderEmailReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
@@ -95,6 +99,10 @@ public class ChangeFlowController {
         changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
         changeFlowListQueryReq.setStartTime(startTime);
         changeFlowListQueryReq.setEndTime(endTime);
+        changeFlowListQueryReq.setCreateSource(createSource);
+        if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
+            Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
+        }
         return AjaxResult.success(changeFlowBiz.query(page, pageSize, changeFlowListQueryReq));
     }