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/service/impl/InteriorChangeConfigServiceImpl.java

@@ -290,13 +290,16 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
 
     @Override
     public CommanderResponse queryCommanderEmail(QueryCommanderEmailReq req) {
-        log.debug("[queryCommanderEmail] req:{}",JSON.toJSONString(req));
         Integer changeExecUserType = req.getChangeExecUserType();
         String changeExecUser = req.getChangeExecUser();
         ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeExecUserType);
+        log.debug("[queryCommanderEmail] req:{},changeCommanderEnum:{}",JSON.toJSONString(req), changeCommanderEnum);
         Assert.notNull(changeCommanderEnum, "变更负责人类型错误");
         CommanderResponse commanderResponse = new CommanderResponse();
         switch (changeCommanderEnum) {
+            case COMMANDER_ORIGINATOR:
+            case FIXED_PERSON:
+                return null;
             case GOODS_ASSOCIATED:
                 String changeItems = req.getChangeItems();
                 Assert.isTrue(StringUtils.isNotBlank(changeItems), "变更负责人为商品时，商品列表不可为空");
@@ -305,6 +308,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
 
                 try {
                     GoodsResponseRpc goodsResponseRpc = queryGoodsCommander(changeCommanderEnum, itemIdList, changeExecUser);
+                    commanderResponse.setName(goodsResponseRpc.getName());
                     commanderResponse.setEmail(goodsResponseRpc.getEmail());
                 } catch (Exception e) {
                     log.error("[queryGoodsCommander] error,e{}", e);
@@ -317,6 +321,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                 try {
                     GoodsResponseRpc supplierResponseRpc = queryChangeSupplier(changeCommanderEnum,
                             changeSupplier, changeExecUser);
+                    commanderResponse.setName(supplierResponseRpc.getName());
                     commanderResponse.setEmail(supplierResponseRpc.getEmail());
                 } catch (Exception e) {
                     log.error("[queryChangeSupplier] error,e{}", e);

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeCommanderEnum.java

@@ -31,7 +31,7 @@ public enum ChangeCommanderEnum {
 
     public static ChangeCommanderEnum getChangeCommanderEnum(Integer id){
         for (ChangeCommanderEnum day : ChangeCommanderEnum.values()) {
-            if (id == day.getId()){
+            if (id.equals(day.getId())){
                 return day;
             }
         }

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

@@ -45,7 +45,9 @@
         select <include refid="Base_Column_List" />
         from TB_YX_QC_CHANGE_RECORD
         <where>
-            create_source = #{createSource}
+            <if test="createSource != null ">
+                and create_source = #{createSource}
+            </if>
             <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

@@ -99,7 +99,10 @@ public class ChangeFlowController {
         changeFlowListQueryReq.setChangeExecDepartment(changeExecDepartment);
         changeFlowListQueryReq.setStartTime(startTime);
         changeFlowListQueryReq.setEndTime(endTime);
-        changeFlowListQueryReq.setCreateSource(createSource);
+        // QC端可以查看所有，不许加入过滤条件
+        if (!CreateSourceEnum.QC.getType().equals(createSource)) {
+            changeFlowListQueryReq.setCreateSource(createSource);
+        }
         if (CreateSourceEnum.TONG_ZHOU.getType().equals(createSource)) {
             Assert.isTrue(Strings.isNotBlank(supplier), "同舟端查询供应商id不可为空");
         }