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/JgChangeRegistrationReformMapper.xml

@@ -56,7 +56,7 @@
             </if>
             <if test="dto.dataType != null and dto.dataType == 'supervision' ">
                 and ur.receive_org_code = #{dto.receiveOrgCode}
-                AND ur.instance_id  is not null
+                AND ur.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="dto.dataType != null and dto.dataType == 'company' ">
                 and ur.use_unit_credit_code = #{dto.useUnitCreditCode}

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

@@ -54,6 +54,7 @@
             </if>
             <if test="type == 'supervision'">
                 AND crt.receive_company_code = #{dto.unitCode}
+                AND crt.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'company'">
                 AND crt.use_unit_credit_code = #{dto.unitCode}
@@ -112,7 +113,7 @@
             </if>
             <if test="type == 'supervision'">
                 AND crt.receive_company_code = #{dto.unitCode}
-                AND crt.instance_id  is not null
+                AND crt.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'company'">
                 AND crt.use_unit_credit_code = #{dto.unitCode}

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

@@ -49,7 +49,7 @@
             </if>
             <if test="type == 'supervision'">
                 AND isn.receive_org_code = #{orgCode}
-                AND isn.instance_id  is not null
+                AND isn.instance_id <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'enterprise'">
                 AND isn.new_use_unit_credit_code = #{orgCode}

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

@@ -102,7 +102,7 @@
                     </if>
                     <if test="param.installUnitCodeFilter != '' and param.installUnitCodeFilter != null">
                         and jet.install_unit_credit_code = #{param.installUnitCodeFilter}
-                        AND jet.instance_id  is not null
+                        AND jet.instance_id  <![CDATA[<>]]>  ''
                     </if>
                 </otherwise>
             </choose>

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

@@ -57,14 +57,14 @@
             </if>
             <if test="type == 'supervision'">
                 AND isn.receive_org_credit_code = #{orgCode}
-                AND isn.instance_id  is not null
+                AND isn.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
             <if test="type == 'testAdmin'">
                 ((AND isn.receive_org_credit_code = #{orgCode}
-                AND isn.instance_id  is not null)
+                AND isn.instance_id  <![CDATA[<>]]>  '')
                 or
                 AND isn.install_unit_credit_code = #{orgCode})
             </if>

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

@@ -42,7 +42,7 @@
                 </if>
             </if>
             <if test="type != 'company'">
-                AND isn.instance_id is not null
+                AND isn.instance_id <![CDATA[<>]]>  ''
                 AND isn.receive_company_code = #{orgCode}
             </if>
             <if test="type == 'company'">
@@ -111,8 +111,8 @@
                fi.factory_standard            AS factoryStandard,
                fi.product_quality_yield_prove AS productQualityYieldProve,
                fi.ins_use_maintain_explain    AS insUseMaintainExplain,
-               useUnit.legal_person                AS safetyManager,
-               useUnit.legal_phone                 AS safetyManagerPhone,
+               useUnit.use_contact                AS safetyManager,
+               useUnit.contact_phone                 AS safetyManagerPhone,
                ui.CITY_NAME                   AS useUnitCityName,
                ui.COUNTY_NAME                 AS useUnitCountyName,
                useUnit.ADDRESS                     AS useUnitAddress,

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

@@ -64,7 +64,7 @@
             <if test="type == 'supervision'">
                 AND (isn.notice_status in ('6612', '6613', '6614', '6616') )
                 AND isn.receive_org_code = #{orgCode}
-                AND isn.instance_id  is not null
+                AND isn.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
@@ -126,8 +126,8 @@
                fi.factory_standard            AS factoryStandard,
                fi.product_quality_yield_prove AS productQualityYieldProve,
                fi.ins_use_maintain_explain    AS insUseMaintainExplain,
-               useUnit.legal_person                AS safetyManager,
-               useUnit.legal_phone                 AS safetyManagerPhone,
+               useUnit.use_contact                AS safetyManager,
+               useUnit.contact_phone                 AS safetyManagerPhone,
                useUnit.ADDRESS                     AS useUnitLeaderAddress,
                installUnit.use_code                   AS useCode,
                installUnit.use_code                   AS installUnitCreditCode,

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

@@ -66,7 +66,7 @@
             </if>
             <if test="dto.type == 'supervision'">
                 and ( ur.receive_org_code = #{orgCode} or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
-                AND ur.instance_id  is not null
+                AND ur.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="dto.type == 'company' ">
                 and (ur.use_unit_code = #{orgCode} or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))

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

@@ -78,14 +78,14 @@
             </if>
             <if test="type == 'supervision'">
                 AND tjtn.receive_company_code = #{orgCode}
-                AND tjtn.instance_id  is not null
+                AND tjtn.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="type == 'company'">
                 AND tjtn.install_unit_credit_code = #{orgCode}
             </if>
             <if test="type == 'testAdmin'">
                 ((AND tjtn.receive_company_code = #{orgCode}
-                AND tjtn.instance_id  is not null)
+                AND tjtn.instance_id  <![CDATA[<>]]>  '')
                 or
                 AND tjtn.install_unit_credit_code = #{orgCode})
             </if>

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

@@ -60,7 +60,7 @@
             </if>
             <if test="dto.dataType == 'supervision' ">
                 and  ur.receive_company_code = #{dto.unitCode}
-                AND  ur.instance_id  is not null
+                AND  ur.instance_id  <![CDATA[<>]]>  ''
             </if>
             <if test="dto.dataType == 'company' ">
                 and  ur.use_unit_credit_code = #{dto.unitCode}

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 改造变更登记
@@ -99,7 +95,9 @@ public class JgChangeRegistrationReformController extends BaseController {
 			dto.setDataType(COMPANY_TYPE_SUPERVISION);
 			dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());
 		}
-		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getList(dto, page,  dto.getRoleIds()));
+		Page<Map<String, Object>> list = jgChangeRegistrationReformServiceImpl.getList(dto, page, dto.getRoleIds());
+		list.getRecords().forEach(x-> x.put("companyType",reginParams.getCompany().getCompanyType()));
+		return ResponseHelper.buildResponse(list);
 	}
 
 

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

@@ -485,6 +485,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             int i = deviceList.indexOf(obj);
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
+            dto.setCreateUserId(RequestContext.getExeUserId());
             dto.setApplyDate(new Date());
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecutorIds(finalNextExecutorRoleIds);

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

@@ -144,10 +144,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 equipMap.put("equRegisterCode", equipMap.getOrDefault("equCode", ""));
                 for (String s : fields) {
                     if (installationInfo.containsKey(s)) {
-                        installationInfo.put(s, JSON.parseArray(installationInfo.get(s).toString()));
+                        installationInfo.put(s, JSON.parse(String.valueOf(installationInfo.get(s))));
                     }
                     if (equipMap.containsKey(s)) {
-                        equipMap.put(s, JSON.parseArray(equipMap.get(s).toString()));
+                        equipMap.put(s, JSON.parse(String.valueOf(equipMap.get(s))));
                     }
                 }
             }