安装告知代码优化

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

@@ -100,11 +100,11 @@
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equip_id
-                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equip_id
-                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equip_id
-                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equip_id
-                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equip_id
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TzsServiceFeignClient.java

@@ -10,7 +10,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 
-@FeignClient(name = "TZS-YMT-LL", url = "172.16.3.155:11000", path = "/ymt", configuration =
+@FeignClient(name = "TZS-YMT",  path = "/ymt", configuration =
         {FeignConfiguration.class})
 public interface TzsServiceFeignClient {
 

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/JgInstallationNoticeServiceImpl.java

@@ -24,14 +24,11 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzsJgOtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzsJgRegistrationInfo;
 
 
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
@@ -40,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -533,9 +529,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         return urls;
     }
 
-    public boolean submit(JgInstallationNoticeDto noticeDto,String op) {
+    public boolean submit(JgInstallationNotice notice,String op) {
 
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId());
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         String taskId = dataObject.getString("id");
         //组装信息
@@ -573,7 +569,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     public void accept(JgInstallationNoticeDto dto,String op) {
 
-        convertField(dto);
+        JgInstallationNotice jgInstallationNotice = this.jgInstallationNoticeMapper.selectById(dto.getSequenceNbr());
         // 组装设备注册代码
         StringBuffer stringBuffer = new StringBuffer();
         String ym = null;
@@ -608,19 +604,17 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         mapCode = code.getResult();
 
 
-        boolean submit = submit(dto, op);
+        boolean submit = submit(jgInstallationNotice, op);
         if(submit) {
             if("0".equals(op)) {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
-                this.generateInstallationNoticeReport(dto.getSequenceNbr());
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
             } else {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-                dto.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
-            JgInstallationNotice bean = new JgInstallationNotice();
-            BeanUtils.copyProperties(dto,bean);
-            bean.setEquRegisterCode(deviceRegistrationCode);
-            jgInstallationNoticeMapper.updateById(bean);
+            jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+            jgInstallationNoticeMapper.updateById(jgInstallationNotice);
 
             // 更新其他业务表
             tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());