Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

@@ -85,6 +85,9 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "任务名称")
     private String taskName;
 
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
     @ApiModelProperty(value = "流程执行角色")
     private String instanceRoles;
 
@@ -114,7 +117,7 @@ public class JgEquipTransferDto  extends BaseDto {
     private String useInnerCode;
 
     @ApiModelProperty(value = "设备地址")
-    private String concatenatedAddress;
+    private String equAddress;
 
     @ApiModelProperty(value = "流程建议")
     private String processAdvice;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,9 +21,9 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
 
-    boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
-    boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgReformNoticeService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -56,7 +57,7 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
+    List<JgReformNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
 
     /**
      * 打印告知单

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

@@ -19,9 +19,6 @@
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
             jet.task_name AS taskName,
-            ri.EQU_LIST AS equList,
-            ri.EQU_CATEGORY AS equCategory,
-            ri.EQU_DEFINE AS equDefine,
             ri.PRODUCT_NAME AS productName,
             ri.BRAND_NAME AS brandName,
             ri.EQU_TYPE AS equType,
@@ -50,9 +47,13 @@
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
             ui.safety_manager AS safetyManager,
             ui.phone AS safetyManagerPhone,
-            CONCAT_WS(', ',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS concatenatedAddress,
+            CONCAT_WS('',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS equAddress,
             ui.USE_INNER_CODE AS useInnerCode,
-            oi.SUPERVISORY_CODE AS supervisoryCode
+            oi.SUPERVISORY_CODE AS supervisoryCode,
+            tec2.name AS equCategory,
+            tec1.name AS equList,
+            tec.name AS equDefine,
+            jet.create_date AS createDate
         FROM
             tzs_jg_equip_transfer jet
             LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
@@ -62,6 +63,9 @@
             LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
             LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
             LEFT JOIN idx_biz_jg_other_info oi ON oi.record = ete.equ_id
+            LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+            LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+            LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
         <where>
             jet.is_delete = false
             <if test="param != null ">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java

@@ -58,7 +58,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
-	public ResponseModel<Boolean> save(@RequestParam(value = "submitType") String submitType,
+	public ResponseModel<Object> save(@RequestParam(value = "submitType") String submitType,
 									   @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){
@@ -81,7 +81,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
-	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
+	public ResponseModel<Object> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
 													 @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferController.java

@@ -46,15 +46,14 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
-    public ResponseModel<String> save(@RequestParam("submitType") String submitType, @RequestBody JSONObject model) {
-        jgEquipTransferServiceImpl.saveTransfer(submitType, model, getSelectedOrgInfo());
-        return ResponseHelper.buildResponse("ok");
+    public ResponseModel<Object> save(@RequestParam("submitType") String submitType, @RequestBody JSONObject model) {
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.saveTransfer(submitType, model, getSelectedOrgInfo()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备移交", notes = "根据sequenceNbr更新设备移交")
-    public ResponseModel<JgEquipTransferDto> updateBySequenceNbr(@RequestParam("submitType") String submitType,
+    public ResponseModel<Object> updateBySequenceNbr(@RequestParam("submitType") String submitType,
                                                                  @RequestBody JgEquipTransferDto equipTransferDto,
                                                                  @RequestParam(value = "op", required = false) String op) {
         return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.updateEquipTransfer(submitType, equipTransferDto, op));

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

@@ -551,7 +551,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(GZGZ_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgReformNoticeService.saveNotice(submitType, jsonObject, reginParams);
+            return jgReformNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.WXGZ.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -586,7 +586,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(YZBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);
-            jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams);
+            return jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) {
 
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
@@ -603,7 +603,7 @@ public class CommonServiceImpl implements ICommonService {
             JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
             jsonObject.put("businessCode", type);
-            jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
+            return jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
         } else if (type.contains(ApplicationFormTypeEnum.YZBF.getBusinessCode()) || type.contains(ApplicationFormTypeEnum.ZXBF.getBusinessCode())) {
             noticeObj.put("cancelType", type.equals("BF_ZX") ? "1" : "2");
             noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));

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

@@ -143,7 +143,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public boolean createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
 
         Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
         if (ValidationUtil.isEmpty(tableData)) {
@@ -329,7 +329,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
-        return true;
+        return  Collections.singletonList(oldTransfer);
     }
 
     /**
@@ -338,7 +338,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param map
      * @return
      */
-    public boolean updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
+    public List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams) {
         return this.createTransfer(submitType, map, reginParams);
     }
 

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

@@ -69,7 +69,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @param reginParams   redis信息
      */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
-    public void saveTransfer(String submitType, JSONObject jsonObjectMap, ReginParams reginParams) {
+    public List<JgEquipTransfer> saveTransfer(String submitType, JSONObject jsonObjectMap, ReginParams reginParams) {
         JgEquipTransferDto model = JSON.parseObject(JSONObject.toJSONString(jsonObjectMap), JgEquipTransferDto.class);
 
         convertField(model);
@@ -111,6 +111,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
         List<JgEquipTransferEq> jgEquipTransferEqList = this.buildJgEquipTransferEqList(equipTransferEqList, transferList);
         jgEquipTransferEqMapper.insertBatchSomeColumn(jgEquipTransferEqList);
+        return transferList;
     }
 
     /**

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

@@ -376,7 +376,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, Object> JgReformNoticeDtoMap, ReginParams reginParams) {
+    public List<JgReformNotice> saveNotice(String submitType, Map<String, Object> JgReformNoticeDtoMap, ReginParams reginParams) {
         JgReformNoticeDto model = JSON.parseObject(JSONObject.toJSONString(JgReformNoticeDtoMap.get(TABLE_PAGE_ID)), JgReformNoticeDto.class);
         convertField(model);
         // 获取告知设备列表
@@ -459,7 +459,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }).collect(Collectors.toList());
 
         jgReformNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-
+        return list;
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        tzjia.*
+        tzjia.*,
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
         cdd.NAME AS equipClassify,
@@ -68,7 +68,7 @@
 
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
-        tzjia.*
+        tzjia.*,
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
         cdd.NAME AS equipClassify,

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

@@ -106,7 +106,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             model.setApplicationUnitCode(reginParams.getCompany().getCompanyCode());
         }
         Page<JyjcInspectionResultModel> resultPage = resultMapper.selectJyjcInspectionResultpPage(page, model);
-        resultPage.getRecords().stream().forEach(v -> {
+        resultPage.getRecords().forEach(v -> {
             if (ResultStatusEnum.NO_RESULT.getCode().equals(v.getResultStatus())) {
                 v.setResultStatusName(ResultStatusEnum.NO_RESULT.getName());
             }

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

@@ -170,7 +170,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 map.put("sequenceNbr",model.getSequenceNbr());
                 map.put("op", "0");
                 map.put("comments", "提交");
-                execueFlow(map);
+                JyjcOpeningApplication jyjcOpeningApplication = execueFlow(map);
+                model.setNextTaskId(jyjcOpeningApplication.getNextTaskId());
 //                TaskResultDTO dto = new TaskResultDTO();
 //                dto.setResultCode("approvalStatus");
 //                dto.setTaskId(model.getNextTaskId());
@@ -521,7 +522,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
-    public void execueFlow(Map<String, Object> params) {
+    public JyjcOpeningApplication execueFlow(Map<String, Object> params) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         String op = params.get("op").toString();
@@ -559,8 +560,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 updateTask(data, workflowResultDto, op);
                 data.setNextTaskId(workflowResultDto.getNextTaskId());
             }else {
+
                 // 流程结束
                 data.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+                //更新办理日期
+                data.setAcceptDate( new Date());
                 // 更新代办
                 HashMap<String, Object> taskParams = new HashMap<>();
                 taskParams.put("relationId", data.getWorkflowProstanceId());
@@ -574,6 +578,11 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             }
         }
         jyjcOpeningApplicationMapper.updateById(data);
+        // 已完成 作废逻辑
+        if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(data.getStatus())){
+            doDiscard(data.getUnitCode(), data.getSequenceNbr());
+        }
+        return data;
     }