modify: 变更工单详情展示供应商加供应商名称字段

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

@@ -180,7 +180,7 @@ public class ChangeFlowBiz {
     public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
         String uid = RequestLocalBean.getUid();
         String name = RequestLocalBean.getName();
-        log.info("[create] createReq={}, uid:{}, name:{}", JSON.toJSONString(changeFlowCreateReq), uid, name);
+        log.debug("[create] createReq={}, uid:{}, name:{}", JSON.toJSONString(changeFlowCreateReq), uid, name);
         // 校验变更主体
         checkSubject(changeFlowCreateReq);
         Long parentChangeClassId = changeFlowCreateReq.getParentChangeClassId();
@@ -603,7 +603,7 @@ public class ChangeFlowBiz {
                 changeFlowService.updateRecord(changeRecord);
                 // 更新行动执行方案，覆盖操作，先删除，后插入
                 Integer changeExecCount = changeFlowExecService.deleteByChangeRecordId(changeRecord.getId());
-                log.info("[CHANGE_FLOW_SUBMIT] delete id:{},  changeExecCount:{}", changeRecord.getId(), changeExecCount);
+                log.debug("[CHANGE_FLOW_SUBMIT] delete id:{},  changeExecCount:{}", changeRecord.getId(), changeExecCount);
                 // 保存变更行动方案记录
                 List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(),
                         changeFlowSubmitReq.getChangeExecProjectList());
@@ -972,14 +972,16 @@ public class ChangeFlowBiz {
         changeFlowVO.setChangeDepartment(changeRecord.getChangeDepartment());
         changeFlowVO.setChangeCommander(changeRecord.getChangeCommander());
         String changeSupplier = changeRecord.getChangeSupplier();
+        changeFlowVO.setChangeSupplier(changeSupplier);
+        String changeSupplierView = "";
         if (StringUtils.isNotBlank(changeSupplier)) {
             List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
             if (CollectionUtils.isNotEmpty(supplierSimple)) {
                 SupplierSimpleRsp supplier = supplierSimple.get(0);
-                changeSupplier = supplier.getSupplierId() + supplier.getSupplierName();
+                changeSupplierView = supplier.getSupplierId() + supplier.getSupplierName();
             }
         }
-        changeFlowVO.setChangeSupplier(changeSupplier);
+        changeFlowVO.setChangeSupplierView(changeSupplierView);
         changeFlowVO.setChangeReason(changeRecord.getChangeReason());
         changeFlowVO.setChangeContent(changeRecord.getChangeContent());
         changeFlowVO.setChangeRiskDesc(changeRecord.getChangeRiskDesc());
@@ -1074,7 +1076,7 @@ public class ChangeFlowBiz {
             });
 
         } catch (Exception ex) {
-            log.info("query user info has ex", ex);
+            log.error("query user info has ex", ex);
         }
         changeFlowVO.setChangeExecProjectList(changeFlowExecRecord);
         changeFlowVO.setCreateTime(changeRecord.getCreateTime());
@@ -1166,7 +1168,7 @@ public class ChangeFlowBiz {
             iusDepartmentReq.setUids(new ArrayList<>(commanderList));
             HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq);
             //AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(commanderList)).build());
-            log.info("query user: {} info: {}", commanderList, JSON.toJSONString(orgMap));
+            log.debug("query user: {} info: {}", commanderList, JSON.toJSONString(orgMap));
             //List<IusUserInfoRsp> data = userListInfo.getData();
             list.forEach(i -> {
                 List<SecondaryDepartments> commander = orgMap.get(i.getChangeCommander());

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

@@ -154,7 +154,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                 allItemList.addAll(itemIds);
             }
         }
-        log.info("[getExportList] allItemList:{}", allItemList);
+        log.debug("[getExportList] allItemList:{}", allItemList);
         List<SpuTO> spuTOS = new ArrayList<>();
         Map<Long, List<SimplePhyCateGoryResultCo>> categoryChain = new HashMap<>();
         Map<Long, ChangeGoodsPrincipalPO> longChangeGoodsPrincipalPOMap = new HashMap<>();

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowVO.java

@@ -115,6 +115,10 @@ public class ChangeFlowVO {
      */
     private String changeSupplier;
     /**
+     * 变更供应商详情展示，供应商id+供应商名称
+     */
+    private String changeSupplierView;
+    /**
      * 变更状态
      * @see ChangeStatusEnum
      */

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

@@ -80,14 +80,14 @@ public class TestController {
     @PostMapping("/createToDo")
 
     public AjaxResult<Void> createTodoTask(ChangeRecord entity) {
-        log.info("[createToDoTask] entity:{}", JSON.toJSONString(entity));
+        log.debug("[createToDoTask] entity:{}", JSON.toJSONString(entity));
         todoService.createTodoTask(entity);
         return AjaxResult.success();
     }
 
     @PostMapping("/progressTodo")
     public AjaxResult<Void> progressTodoTask(ChangeRecord entity, Integer operateType) {
-        log.info("[createToDoTask] entity:{}, operateType:{}", JSON.toJSONString(entity), operateType);
+        log.debug("[createToDoTask] entity:{}, operateType:{}", JSON.toJSONString(entity), operateType);
         todoService.progressTodoTask(entity, operateType);
         return AjaxResult.success();
     }