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/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java

@@ -101,6 +101,9 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "产权单位")
     private String propertyUnitName;
 
+    @ApiModelProperty("产权单位统一信用代码")
+    private String propertyUnitCreditCode;
+
     @ApiModelProperty(value = "使用单位id")
     private String useUnitCreditCode;
 
@@ -266,4 +269,14 @@ public class JgInstallationNoticeDto extends BaseDto {
 
 
     private String transferToUserIds;
+
+    /**
+     * 属地监管部门code
+     */
+    private String orgBranchCode;
+
+    /**
+     * '属地监管部门name'
+     */
+    private String orgBranchName;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -429,4 +429,16 @@ public class JgInstallationNotice extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 属地监管部门code
+     */
+    @TableField(value = "org_branch_code")
+    private String orgBranchCode;
+
+    /**
+     * 属地监管部门name
+     */
+    @TableField(value = "org_branch_name")
+    private String orgBranchName;
 }

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

@@ -60,7 +60,7 @@
                 and ur.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
             <if test="currentUserId != null and currentUserId != '' ">
-                or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%')
+                or(ur.transfer_to_user_ids like concat('%',#{currentUserId},'%') and ur.is_delete = 0)
             </if>
         </where>
         order by ur.rec_date desc

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

@@ -64,7 +64,7 @@
                 AND crt.use_unit_credit_code = #{dto.unitCode}
             </if>
             <if test="currentUserId != null and currentUserId != '' ">
-                or crt.transfer_to_user_ids like concat('%',#{currentUserId},'%')
+                or (crt.transfer_to_user_ids like concat('%',#{currentUserId},'%') and crt.is_delete = 0)
             </if>
         </where>
         order by crt.rec_date desc

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

@@ -58,7 +58,7 @@
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
-            OR (isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )   )
+            OR (isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) and isn.is_delete = false  )
         </where>
         ORDER BY
         isn.create_date DESC,  isn.apply_no DESC

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

@@ -24,7 +24,8 @@
         isn.instance_status AS instanceStatus,
 <!--        isn.equ_address AS equAddress,-->
         isn.handle_date AS handleDate,
-        isn.equ_list AS equList,
+<!--        isn.equ_list AS equList,-->
+        ec.name AS equList,
         isn.notice_report_url AS noticeReportUrl,
         isn.create_user_id as createUserId,
         isn.next_task_id AS nextTaskId,
@@ -33,6 +34,8 @@
         FROM tzs_jg_installation_notice isn
         LEFT JOIN tzs_jg_installation_notice_eq insEq on insEq.equip_transfer_id = isn.sequence_nbr
         LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
+        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = insEq.equ_id
+        LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
         <where>
             isn.is_delete = false
             <if test="param != null ">

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

@@ -175,7 +175,7 @@
                 and receive_org_code = #{contractDto.receiveOrgCodeFilter}
             </if>
             -- 转办隔离逻辑
-            OR (transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+            OR (transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) and  is_delete = 0)
             -- 数据过滤结束 ----------------------------------------------------
         </where>
         order by apply_no desc

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

@@ -121,8 +121,9 @@
                SAFETY_MANAGER as safetyManager,
                SAFETY_MANAGER_CODE as safetyManagerCode,
                PHONE as phone,
-               ESTATE_UNIT_NAME as estateUnitName,
-               ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
+               concat(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME)    as estateUnitName,
+--                ESTATE_UNIT_NAME as estateUnitName,
+--                ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
                ADDRESS as address,
                PROVINCE as province,
                CITY as city,

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -233,6 +234,38 @@ public class CommonController extends BaseController {
 
 
 	/**
+	 * 获取管辖分局树
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getCreatTreeByInstallation")
+	@ApiOperation(httpMethod = "GET", value = "获取管辖分局树安装告知使用", notes = "获取管辖分局树安装告知使用")
+	public ResponseModel<Object> getCreatTreeByInstallation(String county) {
+		List<LinkedHashMap> creatTree = commonService.getCreatTreeByInstallation();
+		String code = county.split("_")[0];
+		List<LinkedHashMap> infoByCounty = getInfoByCounty(code, creatTree);
+		return ResponseHelper.buildResponse(infoByCounty);
+	}
+
+	private List<LinkedHashMap> getInfoByCounty(String county, List<LinkedHashMap> children) {
+		for (LinkedHashMap item : children) {
+			if (item.get("level").toString().equals("county") && item.get("companyCode").toString().equals(county)) {
+				return (List<LinkedHashMap>) item.get("children");
+			} else {
+				if (!ObjectUtils.isEmpty(item.get("children"))) {
+					List<LinkedHashMap> children1 = getInfoByCounty(county, (List<LinkedHashMap>) item.get("children"));
+					if (!CollectionUtils.isEmpty(children1)) {
+						return children1;
+					}
+				}
+			}
+		}
+		return new ArrayList<>();
+	}
+
+
+	/**
 	 * 公共转办接口
 	 * /jg/common/transfer
 	 */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -49,4 +49,8 @@ public interface ICommonService {
     Object transfer(Map<String, Object> obj);
 
     List<LinkedHashMap> getCreatTree();
+
+    List<LinkedHashMap> getCreatTreeByInstallation();
+
+    List<LinkedHashMap> getCreatTreeByInstallationTree();
 }

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

@@ -284,6 +284,25 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    public List<LinkedHashMap> getCreatTreeByInstallation() {
+        List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
+        //判断redis是否存在管辖机构树
+        return !ObjectUtils.isEmpty(result) ? result : getCreatTreeByInstallationTree();
+    }
+
+    @Override
+    public List<LinkedHashMap> getCreatTreeByInstallationTree() {
+        FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
+        List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
+        List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
+        List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
+        List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
+        redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
+        return resultTree;
+    }
+
+
+    @Override
     public List<LinkedHashMap> getTree(ReginParams reginParams) {
         // 企业逻辑
         if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {

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

@@ -912,6 +912,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * @return
      */
     public Page<JSONObject> queryForEquipmentRegisterPage(JSONObject map) {
+
+        if(map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")){
+            return new Page<>();
+        }
+
+
         Integer pageNumber = ObjectUtils.isEmpty(map.getInteger("number")) ? 1 : map.getInteger("number");
         Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
         Page<JSONObject> result = new Page<>(pageNumber, size);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
@@ -124,6 +125,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
     @Autowired
+    SuperviseInfoMapper superviseInfoMapper;
+
+    @Autowired
     IIdxBizJgConstructionInfoService constructionInfoService;
 
     @Autowired
@@ -184,6 +188,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         if(!ValidationUtil.isEmpty(notice.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             installationInfo.put("factoryUseSiteStreet", notice.getFactoryUseSiteStreet() + "_" + notice.getStreetName());
         }
+        if(!ValidationUtil.isEmpty(notice.getOrgBranchCode()) && !ValidationUtil.isEmpty(notice.getOrgBranchName())) {
+            installationInfo.put("orgBranchCode", notice.getOrgBranchCode() + "_" + notice.getOrgBranchName());
+        }
+
+        if(!ValidationUtil.isEmpty(notice.getPropertyUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getPropertyUnitName())) {
+            installationInfo.put("propertyUnitName", notice.getPropertyUnitCreditCode() + "_" + notice.getPropertyUnitName());
+        }
 
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
@@ -685,6 +696,16 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
         }
 
+        String propertyUnitName = model.getPropertyUnitName();
+        if (!ObjectUtils.isEmpty(propertyUnitName)) {
+            String[] split = propertyUnitName.split("_");
+            if (split.length > 1) {
+                model.setPropertyUnitCreditCode(split[0]);
+                model.setPropertyUnitName(split[1]);
+            }
+        }
+
+
         String county = model.getCounty();
         if (!ObjectUtils.isEmpty(county)) {
             String[] countyList = county.split("_");
@@ -703,6 +724,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
         }
 
+        String branchCodeString = model.getOrgBranchCode();
+        if (!ObjectUtils.isEmpty(branchCodeString)) {
+            String[] branchCodeStringList = branchCodeString.split("_");
+            if (branchCodeStringList.length > 1) {
+                model.setOrgBranchCode(branchCodeStringList[0]);
+                model.setOrgBranchName(branchCodeStringList[1]);
+            }
+        }
+
         // 分割单位
         String useUnitId = model.getUseUnitCreditCode();
         if (!ObjectUtils.isEmpty(useUnitId)) {
@@ -860,6 +890,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     useInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian() == null ? "0" : jgInstallationNotice.getIsXixian());
                     useInfoService.saveOrUpdateData(useInfo);
                 }
+                // 修改属地
+                LambdaUpdateWrapper<SuperviseInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lambdaUpdateWrapper.eq(SuperviseInfo::getRecord, jgRelationEquip.getEquId());
+                SuperviseInfo superviseInfo = new SuperviseInfo();
+                superviseInfo.setOrgBranchName(jgInstallationNotice.getOrgBranchName());
+                superviseInfo.setOrgBranchCode(jgInstallationNotice.getOrgBranchCode());
+                superviseInfoMapper.update(superviseInfo, lambdaUpdateWrapper);
+                HashMap<String, Object> hashMap = new HashMap<>();
+                Map<String,Map<String,Object>> superMap = new HashMap<>();
+                hashMap.put("ORG_BRANCH_CODE",jgInstallationNotice.getOrgBranchCode());
+                hashMap.put("ORG_BRANCH_NAME",jgInstallationNotice.getOrgBranchCode());
+                superMap.put(jgRelationEquip.getEquId(), hashMap);
+                tzsServiceFeignClient.commonUpdateEsDataByIds(superMap);
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());

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

@@ -149,6 +149,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useInfo.setProvinceName("陕西省");
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, map.get("equipId"));
+        // 产权单位信息
+        if (map.containsKey("estateUnitName")) {
+            String[] data = String.valueOf(map.getString("estateUnitName")).split("_");
+            useInfo.setEstateUnitCreditCode(data[0]);
+            useInfo.setEstateUnitName(data[1]);
+        }
         // 更新使用信息
         useInfoMapper.update(useInfo, lambda);
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -449,7 +449,7 @@
                         <w:sz w:val="24"/>
                     </w:rPr>
                     <w:pict>
-                        <v:shape id="文本框 9" o:spid="_x0000_s1026" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:-49.05pt;margin-top:125.55pt;height:103.45pt;width:515.75pt;z-index:251662336;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+                        <v:shape id="文本框 9" o:spid="_x0000_s1026" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:-49.05pt;margin-top:120pt;height:150pt;width:515.75pt;z-index:251662336;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
                             <v:path/>
                             <v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
                             <v:stroke on="f" weight="0.5pt"/>
@@ -485,7 +485,7 @@
                                                 <w:sz w:val="46"/>
                                                 <w:sz-cs w:val="46"/>
                                             </w:rPr>
-                                            <w:t>按照《中华人民共和国特种设备安全法》</w:t>
+                                            <w:t>按照《中华人民共和国特种设备安全法》的规定， 依据特种设备安全技术规范要求，予以使用登记。</w:t>
                                         </w:r>
                                         <w:r>
                                             <w:rPr>
@@ -495,22 +495,22 @@
                                             </w:rPr>
                                             <w:t></w:t>
                                         </w:r>
-                                        <w:r>
-                                            <w:rPr>
-                                                <w:spacing w:val="-13"/>
-                                                <w:sz w:val="46"/>
-                                                <w:sz-cs w:val="46"/>
-                                            </w:rPr>
-                                            <w:t>的规定， 依据特种设备安全技术规范要求，予以</w:t>
-                                        </w:r>
-                                        <w:r>
-                                            <w:rPr>
-                                                <w:spacing w:val="1"/>
-                                                <w:sz w:val="46"/>
-                                                <w:sz-cs w:val="46"/>
-                                            </w:rPr>
-                                            <w:t>使用登记。</w:t>
-                                        </w:r>
+<#--                                        <w:r>-->
+<#--                                            <w:rPr>-->
+<#--                                                <w:spacing w:val="-13"/>-->
+<#--                                                <w:sz w:val="46"/>-->
+<#--                                                <w:sz-cs w:val="46"/>-->
+<#--                                            </w:rPr>-->
+<#--                                            <w:t>的规定， 依据特种设备安全技术规范要求，予以</w:t>-->
+<#--                                        </w:r>-->
+<#--                                        <w:r>-->
+<#--                                            <w:rPr>-->
+<#--                                                <w:spacing w:val="1"/>-->
+<#--                                                <w:sz w:val="46"/>-->
+<#--                                                <w:sz-cs w:val="46"/>-->
+<#--                                            </w:rPr>-->
+<#--                                            <w:t>使用登记。</w:t>-->
+<#--                                        </w:r>-->
                                     </w:p>
                                     <w:p>
                                         <w:pPr>
@@ -624,7 +624,7 @@
                         <w:sz w:val="24"/>
                     </w:rPr>
                     <w:pict>
-                        <v:shape id="文本框 15" o:spid="_x0000_s1029" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:-25.65pt;margin-top:686pt;height:44.05pt;width:461.2pt;z-index:251667456;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+                        <v:shape id="文本框 15" o:spid="_x0000_s1029" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:-25.65pt;margin-top:670pt;height:50pt;width:461.2pt;z-index:251667456;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
                             <v:path/>
                             <v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
                             <v:stroke on="f" weight="0.5pt"/>
@@ -662,16 +662,16 @@
                                                 <w:sz w:val="28"/>
                                                 <w:sz-cs w:val="28"/>
                                             </w:rPr>
-                                            <w:t>依据安全技术规范的要求，应当在定期检验确定的有效期和技术参数范围</w:t>
-                                        </w:r>
-                                        <w:r>
-                                            <w:rPr>
-                                                <w:spacing w:val="-12"/>
-                                                <w:sz w:val="28"/>
-                                                <w:sz-cs w:val="28"/>
-                                            </w:rPr>
-                                            <w:t>内使用。</w:t>
+                                            <w:t>依据安全技术规范的要求，应当在定期检验确定的有效期和技术参数范围内使用。</w:t>
                                         </w:r>
+<#--                                        <w:r>-->
+<#--                                            <w:rPr>-->
+<#--                                                <w:spacing w:val="-12"/>-->
+<#--                                                <w:sz w:val="28"/>-->
+<#--                                                <w:sz-cs w:val="28"/>-->
+<#--                                            </w:rPr>-->
+<#--                                            <w:t>内使用。</w:t>-->
+<#--                                        </w:r>-->
                                     </w:p>
                                     <w:p>
                                         <w:pPr>