修改单位变更详情

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationUnitMapper.java

@@ -37,4 +37,6 @@ public interface JgChangeRegistrationUnitMapper extends CustomBaseMapper<JgChang
      */
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
+
+    String queryEquipIdBySeq(@Param("sequenceNbr") long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationUnitMapper.xml

@@ -118,4 +118,13 @@
             isn.sequence_nbr = #{sequenceNbr}
             LIMIT 1
     </select>
+    <select id="queryEquipIdBySeq" resultType="java.lang.String">
+
+        select
+            equ_id as equid
+        from
+            tzs_jg_change_registration_unit_eq
+        where
+            unit_change_registration_id = #{sequenceNbr}
+    </select>
 </mapper>

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

@@ -666,15 +666,13 @@ public class CommonServiceImpl implements ICommonService {
         taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_TRANSFER.getCode());
         taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_TRANSFER.getName());
         taskV2Model.setEndUserId(RequestContext.getExeUserId());
-        Date createDate = taskV2Model.getCreateDate();
-        taskV2Model.setCreateDate(new Date());
         taskV2Model.setEndDate(new Date());
         String routhPath = taskV2Model.getRoutePath().replace("nextExecuteUserIds", "executeUserId") + "&nextExecuteUserIds=" + assignee;
         taskV2Model.setRoutePath(routhPath);
         Systemctl.taskV2Client.update(taskV2Model, taskV2Model.getSequenceNbr());
         //创建新待办
         taskV2Model.setExecuteUserIds(assignee);
-        taskV2Model.setCreateDate(createDate);
+        taskV2Model.setCreateDate(new Date());
         taskV2Model.setTaskStatus(0);
         taskV2Model.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
         taskV2Model.setEndUserId(null);

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

@@ -170,6 +170,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         // 设备信息
         List<Map<String, Object>> equipmentInfos = JgChangeRegistrationUnitMapper.queryEquipInformation(sequenceNbr);
+        String equipId = JgChangeRegistrationUnitMapper.queryEquipIdBySeq(sequenceNbr);
+        Map<String, Object> detailFieldCamelCaseByRecord = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+        detailFieldCamelCaseByRecord.remove("useUnitCreditCode");
+
 
         for (String s : fields) {
             if (changeInfo.containsKey(s) && !ObjectUtils.isEmpty(changeInfo.get(s))) {
@@ -183,7 +187,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         Map<String, Object> newMap = new HashMap<>();
         newMap.putAll(changeInfo);
         newMap.putAll(equipmentInfos.get(0));
-
+        newMap.putAll(detailFieldCamelCaseByRecord);
         return new HashMap<String, Map<String, Object>>() {{
             this.put("changeRegisInfo", newMap);
         }};

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

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.org.apache.bcel.internal.generic.NEW;
-import com.sun.org.apache.regexp.internal.RE;
+
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;