增加字符赋值

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSON;
@@ -135,6 +136,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 dto.setBusinessKey(String.valueOf(new Date().getTime()));
                 dto.setCompleteFirstTask(true);
                 list.add(dto);
+                String[] inspectionUnit = model.getInspectionUnitCode().split("_");
+                model.setInspectionUnitCode(inspectionUnit[0]);
+                model.setInspectionUnitName(inspectionUnit[1]);
+
                 actWorkflowBatchDTO.setProcess(list);
                 dto.setNextExecuteUserCompanyCode(model.getInspectionUnitCode());
                 processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -175,7 +180,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
             model.setPromoter(reginParams.getUserModel().getUserId());
-
+            model.setApplicationUnitName(reginParams.getCompany().getCompanyName());
 
             jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             List<JyjcInspectionApplicationEquip>  equipInfos = new ArrayList<>();
@@ -529,10 +534,22 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             entity.setProcessDescription(processDescription);
         }
         List<String> persons = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePerson")), String.class);
-        String inspectionChargePerson = persons == null?"":String.join(",",persons);
-        if (StringUtils.isNotBlank(inspectionChargePerson)) {
-            entity.setInspectionChargePerson(inspectionChargePerson);
+        if (CollectionUtil.isNotEmpty(persons)){
+
+            List<String> personCodes = new ArrayList<>();
+            List<String> personNames = new ArrayList<>();
+            for (String person : persons) {
+                String[] s = person.split("_");
+                personCodes.add(s[0]);
+                personNames.add(s[1]);
+            }
+            String inspectionChargePerson = persons == null?"":String.join(",",persons);
+            if (StringUtils.isNotBlank(inspectionChargePerson)) {
+                entity.setInspectionChargePerson(String.join(",",personCodes));
+                entity.setInspectionChargePersonName(String.join(",",personNames));
+            }
         }
+
         String inspectionChargePhone = (String)params.get("inspectionChargePhone");
         if (StringUtils.isNotBlank(inspectionChargePhone)) {
             entity.setInspectionChargePhone(inspectionChargePhone);