维保调用接口修改

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

@@ -103,8 +103,8 @@
         sequence_nbr,
         apply_no,
         status,
+        apply_status,
         apply_date,
-        equ_type,
         use_unit_code,
         use_unit_name,
         receive_org_code,
@@ -113,20 +113,9 @@
         maintenance_unit_name,
         date_format(IFNULL(inform_start, null),'%Y-%m-%d') informStart,
         date_format(IFNULL(inform_end, null),'%Y-%m-%d') informEnd,
-        maintenance_manager_one_id,
-        maintenance_manager_two_id,
         emergency_call,
         maintenance_24_tel,
-        remark,
-        is_delete,
-        input_unit_no,
-        maintenance_contract,
-        maintenance_cycle,
-        overhaul_cycle,
         equ_num,
-        rec_user_id,
-        rec_date,
-        create_user_id,
         create_date,
         instance_id,
         promoter,
@@ -144,8 +133,8 @@
             <if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
                 and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
             </if>
-            <if test="contractDto.applyStatus != '' and contractDto.applyStatus != null">
-                and apply_status like concat('%',#{contractDto.applyStatus},'%')
+            <if test="contractDto.status != '' and contractDto.status != null">
+                and status not like concat('%',#{contractDto.status},'%')
             </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
                 and use_unit_code = #{contractDto.useUnitCode}

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

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
+import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -30,11 +31,13 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -52,14 +55,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public static final String SUBMIT_TYPE_FLOW = "1";
     public static final String WB_PROCESS_DEFINITION_KEY = "maintenanceFiling";
     private static final String HANDLING_STATUS_DICTIONARY = "JGGZZZ";
+    private static final String USE = "使用";
+
+    @Autowired
+    TzsServiceFeignClient tzsServiceFeignClient;
+
     @Autowired
     RestHighLevelClient restHighLevelClient;
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
-    @SuppressWarnings("all")
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     private JgMaintenanceContractMapper maintenanceContractMapper;
     @Autowired
     private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
@@ -89,10 +94,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             //使用单位用"使用单位统一信用代码"匹配数据
             dto.setUseUnitCode(company.getCompanyCode());
             dto.setRoleIds(null);
+            dto.setStatus(null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
             //维保单位用"维保单位统一信用代码"匹配数据
             dto.setMaintenanceUnitCode(company.getCompanyCode());
+            dto.setStatus(dto.getStatus().contains(USE) ? USE : null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
             //监管单位用"接收机构统一使用代码"匹配
@@ -349,15 +356,21 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     /**
      * 新增维保合同
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Boolean saveOrSubmit(String submit, Map<String, Object> map, ReginParams reginParams) {
         JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map), JgMaintenanceContractDto.class);
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
         CompanyBo company = reginParams.getCompany();
         JgMaintenanceContract contract = new JgMaintenanceContract();
         BeanUtils.copyProperties(dto, contract);
+        contract.setCreateDate(new Date());
         //获取维保备案编号
-        String wbApplyNo = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1).get(0);
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), 1);
+        if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
+            log.error("告知单获取失败");
+            return false;
+        }
+        String wbApplyNo = listResponseModel.getResult().get(0);
         contract.setApplyNo(wbApplyNo);
         contract.setUseUnitCode(company.getCompanyCode());
         contract.setUseUnitName(company.getCompanyName());
@@ -450,6 +463,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             jgMaintenanceContract.setNextExecuteIds(role);
             jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
             jgMaintenanceContract.setInstanceId(instanceId);
+            jgMaintenanceContract.setApplyDate(new Date());
             if (!ObjectUtils.isEmpty(jgMaintenanceContract.getInstanceStatus())) {
                 jgMaintenanceContract.setInstanceStatus(jgMaintenanceContract.getInstanceStatus() + "," + role);
             } else {