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

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.DataDockServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FilenameUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -14,7 +15,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.List;
 import java.util.Map;
 
-
+@Validated
 @RestController
 @Api(tags = "数据对接 API")
 @RequestMapping(value = "/dataDock")
@@ -59,12 +60,22 @@ public class DataDockController {
         return ResponseHelper.buildResponse(dataDockService.dataCheckAndImportEquipmentData(remark, file));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/delete")
-    @ApiOperation(httpMethod = "POST", value = "八大类历史设备导入shanchu", notes = "八大类历史设备导入shachu")
-    public Object importData() {
-        dataDockService.delete();
-        return ResponseHelper.buildResponse("ok");
-    }
+    // @TycloudOperation(ApiLevel = UserType.AGENCY)
+    // @PostMapping(value = "/delete")
+    // @ApiOperation(httpMethod = "POST", value = "八大类历史设备导入shanchu", notes = "八大类历史设备导入shachu")
+    // public Object importData() {
+    //     dataDockService.delete();
+    //     return ResponseHelper.buildResponse("ok");
+    // }
+
+    // @TycloudOperation(ApiLevel = UserType.AGENCY)
+    // @GetMapping(value = "/yanChang/ORG_BRANCH_CODE")
+    // @ApiOperation(httpMethod = "get", value = "延炼-延长-刷入属地监管部门", notes = "延炼-延长-刷入属地监管部门")
+    // public Object writeOrgBranchCode2YanChang(@NotNull @RequestParam String remark) {
+    //     if (ValidationUtil.isEmpty(remark)) {
+    //         throw new BadRequest("remark必填！");
+    //     }
+    //     return ResponseHelper.buildResponse("更新成功，共" + dataDockService.writeOrgBranchCode2YanChang(remark) + "条数据");
+    // }
 }
 

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

@@ -19,6 +19,8 @@ import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -116,28 +118,38 @@ public class DataDockServiceImpl {
         }
     }
 
-    public void delete() {
-        List<String> records = idxBizJgUseInfoService.lambdaQuery().select(IdxBizJgUseInfo::getRecord).likeRight(IdxBizJgUseInfo::getRemark, "延炼").list()
-                .stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
-
-
-        // saveProjectContraption(equ, equList);
-        idxBizJgUseInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgUseInfo>().in(IdxBizJgUseInfo::getRecord, records));
-        idxBizJgDesignInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgDesignInfo>().in(IdxBizJgDesignInfo::getRecord, records));
-        idxBizJgFactoryInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgFactoryInfo>().in(IdxBizJgFactoryInfo::getRecord, records));
-        idxBizJgRegisterInfoServiceImpl.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().in(IdxBizJgRegisterInfo::getRecord, records));
-        idxBizJgSupervisionInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgSupervisionInfo>().in(IdxBizJgSupervisionInfo::getRecord, records));
-        iIdxBizJgTechParamsLiftingService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsLifting>().in(IdxBizJgTechParamsLifting::getRecord, records));
-        iIdxBizJgTechParamsVehicleService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsVehicle>().in(IdxBizJgTechParamsVehicle::getRecord, records));
-        iIdxBizJgTechParamsBoilerService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsBoiler>().in(IdxBizJgTechParamsBoiler::getRecord, records));
-        iIdxBizJgTechParamsVesselService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsVessel>().in(IdxBizJgTechParamsVessel::getRecord, records));
-        iIdxBizJgTechParamsPipelineService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records));
-        iIdxBizJgTechParamsRidesService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsRides>().in(IdxBizJgTechParamsRides::getRecord, records));
-        iIdxBizJgTechParamsRopewayService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsRopeway>().in(IdxBizJgTechParamsRopeway::getRecord, records));
-        iIdxBizJgTechParamsElevatorService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsElevator>().in(IdxBizJgTechParamsElevator::getRecord, records));
-        records.forEach(record -> this.saveEquInfoToEs(record));
-    }
-
+    // public void delete() {
+    // List<String> records = idxBizJgUseInfoService.lambdaQuery().select(IdxBizJgUseInfo::getRecord).likeRight(IdxBizJgUseInfo::getRemark, "延炼").list()
+    //         .stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
+    //
+    //
+    // // saveProjectContraption(equ, equList);
+    // idxBizJgUseInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgUseInfo>().in(IdxBizJgUseInfo::getRecord, records));
+    // idxBizJgDesignInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgDesignInfo>().in(IdxBizJgDesignInfo::getRecord, records));
+    // idxBizJgFactoryInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgFactoryInfo>().in(IdxBizJgFactoryInfo::getRecord, records));
+    // idxBizJgRegisterInfoServiceImpl.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().in(IdxBizJgRegisterInfo::getRecord, records));
+    // idxBizJgSupervisionInfoService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgSupervisionInfo>().in(IdxBizJgSupervisionInfo::getRecord, records));
+    // iIdxBizJgTechParamsLiftingService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsLifting>().in(IdxBizJgTechParamsLifting::getRecord, records));
+    // iIdxBizJgTechParamsVehicleService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsVehicle>().in(IdxBizJgTechParamsVehicle::getRecord, records));
+    // iIdxBizJgTechParamsBoilerService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsBoiler>().in(IdxBizJgTechParamsBoiler::getRecord, records));
+    // iIdxBizJgTechParamsVesselService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsVessel>().in(IdxBizJgTechParamsVessel::getRecord, records));
+    // iIdxBizJgTechParamsPipelineService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records));
+    // iIdxBizJgTechParamsRidesService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsRides>().in(IdxBizJgTechParamsRides::getRecord, records));
+    // iIdxBizJgTechParamsRopewayService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsRopeway>().in(IdxBizJgTechParamsRopeway::getRecord, records));
+    // iIdxBizJgTechParamsElevatorService.getBaseMapper().delete(new LambdaQueryWrapper<IdxBizJgTechParamsElevator>().in(IdxBizJgTechParamsElevator::getRecord, records));
+    // records.forEach(record -> this.saveEquInfoToEs(record));
+    // }
+
+    // public Integer writeOrgBranchCode2YanChang(String remark) {
+    //     List<String> records = idxBizJgUseInfoService.lambdaQuery().select(IdxBizJgUseInfo::getRecord).eq(IdxBizJgUseInfo::getRemark, remark).list().stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
+    //
+    //     idxBizJgSupervisionInfoService.lambdaUpdate().set(IdxBizJgSupervisionInfo::getOrgBranchCode, "50*74*160*12478").set(IdxBizJgSupervisionInfo::getOrgBranchName, "交口河镇市场监管所").in(IdxBizJgSupervisionInfo::getRecord, records).update();
+    //     records.forEach(record -> {
+    //         esEquipmentCategory.deleteById(record);
+    //         this.saveEquInfoToEs(record);
+    //     });
+    //     return records.size();
+    // }
 
     /**
      * 保存工程装置表信息
@@ -275,6 +287,15 @@ public class DataDockServiceImpl {
         if (!ObjectUtils.isEmpty(supervisionInfo)) {
             supervisionInfo.setRecord(record);
             supervisionInfo.setRecDate(new Date());
+            // 根据使用单位所在监管所写入属地监管部门
+            String useUnitCode = String.valueOf(equ.get("useUnitCode")).trim();
+            CompanyModel companyModel = Privilege.companyClient.queryByCompanyCode(useUnitCode).getResult();
+            Optional.ofNullable(companyModel).ifPresent(com -> {
+                String superOrgCode = com.getOrgCode().substring(0, com.getOrgCode().lastIndexOf("*"));
+                supervisionInfo.setOrgBranchCode(superOrgCode);
+                CompanyModel compnay = JSON.parseObject(toJSONString(JSON.parseObject(toJSONString(Privilege.companyClient.queryByOrgcode(superOrgCode).getResult())).get("compnay")), CompanyModel.class);
+                supervisionInfo.setOrgBranchName(compnay.getCompanyName());
+            });
             idxBizJgSupervisionInfoService.save(supervisionInfo);
         }
     }
@@ -485,7 +506,6 @@ public class DataDockServiceImpl {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    // @GlobalTransactional(rollbackFor = Exception.class)
     public Object dataCheckAndImportEquipmentData(String remark, MultipartFile file) {
 
         List<EquipInfoExcelDto> equipInfoExcelDtos;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/EnterpriseBizMapper.xml

@@ -28,7 +28,8 @@
             (SELECT cdd.name from amos_tzs_biz.cb_data_dictionary cdd WHERE cdd.code = industry_supervisor and cdd.type = 'HYZGBM') AS industrySupervisorName,
         </if>
 
-        CONCAT(street,'/',address) AS full_address
+        CONCAT(street,'/',address) AS full_address,
+        COALESCE(use_unit_certificate, '身份证') AS useUnitCertificate
         FROM
         tz_base_enterprise_info
         <if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('检验检测机构') !=-1 ">

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizServiceImpl.java

@@ -91,11 +91,11 @@ public class EnterpriseBizServiceImpl {
 
         List<String> unitTypeList = new ArrayList<>();
         unitTypeList.add(tzBaseEnterpriseInfoDto.getUnitType());
-        if (tzBaseEnterpriseInfoDto.getUnitType().equals(UnitTypeEnum.SYDW.getName())) {
+        if (UnitTypeEnum.SYDW.getName().equals(tzBaseEnterpriseInfoDto.getUnitType())) {
             unitTypeList.add(UnitTypeEnum.GRZT.getName());
         }
 
-        if(tzBaseEnterpriseInfoDto.getUnitType().contains(UnitTypeEnum.JYJCJG.getName())){
+        if(tzBaseEnterpriseInfoDto.getUnitType() != null && tzBaseEnterpriseInfoDto.getUnitType().contains(UnitTypeEnum.JYJCJG.getName())){
             if(!ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getJyjcStatus())){
                 String jyjcStatus = tzBaseEnterpriseInfoDto.getJyjcStatus();
                 String[] array = jyjcStatus.split("-");

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

@@ -96,8 +96,8 @@
 		<if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('使用单位')!=-1">
 			(SELECT cdd.name from amos_tzs_biz.cb_data_dictionary cdd WHERE cdd.code = industry_supervisor and cdd.type = 'HYZGBM') AS industrySupervisorName,
 		</if>
-
-		CONCAT(street,'/',address) AS full_address
+		CONCAT(street,'/',address) AS full_address,
+		COALESCE(use_unit_certificate, '身份证') AS useUnitCertificate
 		FROM
 		tz_base_enterprise_info
 		<if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('检验检测机构') !=-1 ">