Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -51,6 +51,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -158,7 +159,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 checkEsData(record);
             }
         } catch (Exception e) {
-            //删除Es数据
+            log.error(e.getMessage(), e);
+            //删除数据库数据和ES数据
+            if (!ObjectUtils.isEmpty(record)) {
+                List<String> records = new ArrayList<>();
+                records.add(record);
+                superviseInfoMapper.deleteDataAll(records);
+                esEquipmentCategory.deleteById(record);
+            }
+            ResponseModel<Object> response = new ResponseModel<>();
+            response.setDevMessage(e.getMessage());
+            response.setResult(null);
+            response.setMessage("操作失败，请检查数据输入后重新提交");
+            response.setStatus(HttpStatus.BAD_REQUEST.value());
+            return response;
         }
         return ResponseHelper.buildResponse(record);
     }
@@ -409,9 +423,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (!ValidationUtil.isEmpty(level)) {
                 if (LEVEL.equals(level)) {
                     //企业
-                    if(!ValidationUtil.isEmpty(level) && ValidationUtil.equals(type,"使用单位")){
+                    if(!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type,"使用单位")){
                         map.put("USE_UNIT_CREDIT_CODE", companyCode);
-                    }else if(!ValidationUtil.isEmpty(level) && ValidationUtil.equals(type,"安装改造维修单位")){
+                    }else if(!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type,"安装改造维修单位")){
                         map.put("USC_UNIT_CREDIT_CODE", companyCode);
                     }
 

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

@@ -5,6 +5,10 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication">
         select
+        tzjia.sequence_nbr,
+        tzjia.process_instance_id,
+        tzjia.workflow_node,
+        tzjia.biz_type,
         tzjia.application_no,
         tzjia.inspection_type,
         (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.inspection_classify and cb_data_dictionary.type = 'JYJCLB') as inspectionClassify,

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/CommonController.java

@@ -50,4 +50,12 @@ public class CommonController extends BaseController {
     public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
         return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitList());
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getInspectionUnit/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询检验检测机构基本信息", notes = "查询检验检测机构基本信息")
+    public ResponseModel<TzBaseEnterpriseInfo> getInspectionUnitBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitBySequenceNbr(sequenceNbr));
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -100,7 +100,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
 		JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationServiceImpl.getById(sequenceNbr);
 		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()));
-		if(status.contains(jyjcOpeningApplication.getStatus())){
+		if(!status.contains(jyjcOpeningApplication.getStatus())){
 			throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除！");
 		}
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.removeById(sequenceNbr));

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

@@ -52,4 +52,8 @@ public class CommonserviceImpl {
     public List<TzBaseEnterpriseInfo> getInspectionUnitList() {
         return enterpriseInfoMapper.getInspectionUnitList(UNIT_TYPE);
     }
+
+    public TzBaseEnterpriseInfo getInspectionUnitBySequenceNbr(Long sequenceNbr) {
+        return enterpriseInfoMapper.selectBySeq(sequenceNbr);
+    }
 }

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

@@ -266,7 +266,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         execueFlow(params);
         // 执行接收业务
         String type = (String) params.get("type");
-        Long sequenceNbr = (Long) params.get("sequenceNbr");
+        Long sequenceNbr = Long.parseLong((String) params.get("sequenceNbr"));
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {

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

@@ -348,19 +348,23 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (ObjectUtils.isEmpty(ajaxResult1)) {
 
             }
-            updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
             if (op.equals("0")) {
                 String originalDataId = params.get("originalDataId").toString();
                 JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
-                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().replace("[", "").replace("]", "").split(","));
+                List<String> detectionRegion = (List<String>) params.get("detectionRegion");
 //                String detectionRegionName =  params.get("detectionRegionName").toString();
-                jyjcOpeningApplication.setDetectionRegion(detectionRegion);
+                if(!detectionRegion.isEmpty()){
+                    jyjcOpeningApplication.setDetectionRegion(detectionRegion);
+                }
 //                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
                 if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
                     jyjcOpeningApplication.setAcceptDate(new Date());
                 }
                 jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
             }
+
+            updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -421,7 +425,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         List<JyjcOpeningApplication> jyjcOpeningApplicationList=jyjcOpeningApplicationMapper.selectList(new QueryWrapper<JyjcOpeningApplication>()
                 .in("sequence_nbr"));
         List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()));
-        jyjcOpeningApplicationList = jyjcOpeningApplicationList.stream().filter(jyjcOpeningApplication ->!status.contains(jyjcOpeningApplication.getStatus())).collect(Collectors.toList());
+        jyjcOpeningApplicationList = jyjcOpeningApplicationList.stream().filter(jyjcOpeningApplication ->status.contains(jyjcOpeningApplication.getStatus())).collect(Collectors.toList());
         if(jyjcOpeningApplicationList.isEmpty()){
             throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除，请核对数据后重新提交！");
         }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -52,4 +52,15 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	 *
 	 */
 	List<TzBaseEnterpriseInfo> getInspectionUnitList(@Param("unitType") String unitType);
+
+	/**
+	 * 根据ID查找企业详情信息
+	 *
+	 *
+	 * @param sequenceNbr sequenceNbr
+	 * @return {@link  TzBaseEnterpriseInfo}
+	 * @author yangyang
+	 * @throws
+	 */
+	TzBaseEnterpriseInfo selectBySeq(Long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -159,5 +159,7 @@
 		from tz_base_enterprise_info
 		where unit_type LIKE CONCAT('%',#{unitType},'%')
 	</select>
-
+	<select id="selectBySeq" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo">
+		select * from tz_base_enterprise_info where sequence_nbr = #{sequenceNbr}
+	</select>
 </mapper>