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

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

@@ -109,6 +109,7 @@
                USE_UNIT_CREDIT_CODE as useUnitCreditCode,
                USE_PLACE as usePlace,
                SAFETY_MANAGER as safetyManager,
+               SAFETY_MANAGER_CODE as safetyManagerCode,
                PHONE as phone,
                ESTATE_UNIT_NAME as estateUnitName,
                ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonserviceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
@@ -69,10 +70,10 @@ public class CommonController extends BaseController {
         if (CollectionUtils.isEmpty(userPhones)){
             return null;
         }
-        List<String> phones = userPhones.stream().map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
+        List<String> phones = userPhones.stream().filter(e-> StringUtils.isNotEmpty(e.getInnerPersonCode())).map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
         Map<String,Object> map = new HashMap<>();
         if (CollectionUtils.isEmpty(phones)){
-            map.put("innerPersonCode","");
+            map.put("innerPersonCode"," ");
         }else { String innerPersonCode = String.join(",", phones);
             map.put("innerPersonCode",innerPersonCode);
         }

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

@@ -104,11 +104,11 @@ public class JyjcOpeningApplicationController extends BaseController {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-		JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationServiceImpl.getById(sequenceNbr);
-		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()), String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-		if(status.contains(jyjcOpeningApplication.getStatus())) {
-			throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除！");
-		}
+//		JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationServiceImpl.getById(sequenceNbr);
+//		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()), String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+//		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/JyjcInspectionApplicationServiceImpl.java

@@ -260,15 +260,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     public Boolean deleteBatchData(List<Long> sequenceNbr) {
 
-        List<JyjcInspectionApplication> jyjcInspectionApplications = this.getBaseMapper().selectBatchIds(sequenceNbr);
-        long count = jyjcInspectionApplications.stream().filter(e ->
-                e.getStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()))
-                        || e.getStatus().equals(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode()))
-                       ).count();
-
-        if (count > 0) {
-            throw new BadRequest("存在 已完成、待受理状态的报检单 不可删除!");
-        }
+//        List<JyjcInspectionApplication> jyjcInspectionApplications = this.getBaseMapper().selectBatchIds(sequenceNbr);
+////        long count = jyjcInspectionApplications.stream().filter(e ->
+////                e.getStatus().equals(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()))
+////                        || e.getStatus().equals(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode()))
+////                       ).count();
+////
+////        if (count > 0) {
+////            throw new BadRequest("存在 已完成、待受理状态的报检单 不可删除!");
+////        }
 
         this.deleteBatchSeq(sequenceNbr);
         for (Long seq : sequenceNbr) {