Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsCraftRouteServiceImpl.java

@@ -2,6 +2,8 @@ package com.rongwei.bscommon.sys.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.ApsCraftRouteDao;
 import com.rongwei.bscommon.sys.service.ApsCraftRouteOutMaterRequestService;
@@ -95,7 +97,6 @@ public class ApsCraftRouteServiceImpl extends ServiceImpl<ApsCraftRouteDao, ApsC
         mindMap.put("BSID", craftrouteid);
         List<SysMindMappingDo> sysMindMappingDoList = sysMindMappingService.listByMap(mindMap).stream().collect(Collectors.toList());
         Collections.sort(sysMindMappingDoList, Comparator.comparing(SysMindMappingDo::getTreecode, Comparator.nullsFirst(Comparator.naturalOrder())));
-        Collections.sort(sysMindMappingDoList, Comparator.comparing(SysMindMappingDo::getCreatedate));
         if (sysMindMappingDoList.size() == 0) {
             return R.error("工艺路线图不存在");
         }
@@ -171,7 +172,11 @@ public class ApsCraftRouteServiceImpl extends ServiceImpl<ApsCraftRouteDao, ApsC
                         sysMindMappingDo1.setId(stepId);
                         sysMindMappingDo1.setParentid(processVo.get(0).getProcessId());
                         sysMindMappingDo1.setBsid(newRouteId);
-                        sysMindMappingDo1.setRoption(craftRouteStepDo.toString());//存新的步骤信息
+                        //存新的步骤信息
+                        JSONObject jsonObject = JSON.parseObject(sysMindMappingDo1.getRoption());
+                        jsonObject.put("ID", stepId);
+                        jsonObject.put("CRAFTROUTEID", newRouteId);
+                        sysMindMappingDo1.setRoption(jsonObject.toString());
 
                         sysMindMappingDos.add(sysMindMappingDo1);
                         newProcessIds.add(previousProcessVo);
@@ -219,7 +224,11 @@ public class ApsCraftRouteServiceImpl extends ServiceImpl<ApsCraftRouteDao, ApsC
                     sysMindMappingDo1.setId(stepId);
                     sysMindMappingDo1.setParentid(mindStrId);
                     sysMindMappingDo1.setBsid(newRouteId);
-                    sysMindMappingDo1.setRoption(craftRouteStepDo.toString());//存新的步骤信息
+                    //存新的步骤信息
+                    JSONObject jsonObject = JSON.parseObject(sysMindMappingDo1.getRoption());
+                    jsonObject.put("ID", stepId);
+                    jsonObject.put("CRAFTROUTEID", newRouteId);
+                    sysMindMappingDo1.setRoption(jsonObject.toString());
 
                     craftRouteStepDo.setId(stepId);
                     craftRouteStepDo.setCraftrouteid(newRouteId);