1.A071需求后端冗余字段receive_company_org_code

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

@@ -253,4 +253,10 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "other_accessories")
     private String otherAccessories;
+
+    /**
+     * 接收机构公司的org_code
+     */
+    @TableField("receive_company_org_code")
+    private String receiveCompanyOrgCode;
 }

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

@@ -251,4 +251,9 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
 
+    /**
+     * 接收机构公司的org_code
+     */
+    @TableField("receive_company_org_code")
+    private String receiveCompanyOrgCode;
 }

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

@@ -241,4 +241,10 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField(value = "other_accessories")
     private String otherAccessories;
+
+    /**
+     * 接收机构公司的org_code
+     */
+    @TableField("receive_company_org_code")
+    private String receiveCompanyOrgCode;
 }

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

@@ -204,4 +204,10 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField(value = "manage_type")
     private String manageType;
+
+    /**
+     * 接收机构公司的org_code
+     */
+    @TableField("receive_company_org_code")
+    private String receiveCompanyOrgCode;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -88,5 +88,13 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * @return List<JgBizCountDataBO>
      */
     List<JgBizCountDataBO> queryForRegisterCountData(@Param("param") ReportAnalysisSearchDTO reportAnalysisSearchDTO);
+
+
+    /**
+     * 单位详情
+     * @param companyCode
+     * @return CompanyBo
+     */
+    CompanyBo queryCompanyInfoByCode(String companyCode);
 }
 

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

@@ -551,6 +551,18 @@
             and org_code Like concat(#{orgCode}, '%')
         </if>
     </select>
+    <select id="queryCompanyInfoByCode" resultType="com.yeejoin.amos.boot.biz.common.bo.CompanyBo">
+        SELECT
+        sequence_nbr,
+        company_name,
+        company_code,
+        org_code,
+        parent_id
+        FROM "privilege_company"
+        where
+        is_deleted = false
+        and company_code = #{companyCode}
+    </select>
     <sql id="equ-filter">
         <if test="param.equList != null and param.equList !=''">
             and r."EQU_LIST" =  #{param.equList}

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

@@ -165,4 +165,11 @@ public interface ICommonService {
      * 查询since之前已经完成的使用登记单子
      */
     List<String> refreshTheDetailsDataOfCompletedUsageRegistration(String since);
+
+    /**
+     * 公司详情
+     * @param companyCode 公司编码
+     * @return CompanyBo
+     */
+    CompanyBo getOneCompany(String companyCode);
 }

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

@@ -1758,6 +1758,12 @@ public class CommonServiceImpl implements ICommonService {
         return commonMapper.refreshTheDetailsDataOfCompletedUsageRegistration(since);
     }
 
+    @Override
+    public CompanyBo getOneCompany(String companyCode) {
+        CompanyBo companyBo = commonMapper.queryCompanyInfoByCode(companyCode);
+        return companyBo == null ? new CompanyBo() : companyBo;
+    }
+
     /**
      * 根据设备列表代码选择对应的 PDF 模板
      * @param equListCode 设备代码

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -186,6 +187,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         } else {
             jgChangeRegistrationReform.setReceiveCompanyCode("610000");
         }
+        // 统计用
+        CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
+        jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         //使用登记编号
         jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));

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

@@ -222,7 +222,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         //办理状态
         oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass());
         oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass());
-
+        // 统计使用
+        CompanyBo companyBo = commonServiceImpl.getOneCompany(oldTransfer.getReceiveCompanyCode());
+        oldTransfer.setReceiveCompanyOrgCode(companyBo.getOrgCode());
         String fullAddress = "";
         String province = (String) tableData.get("province");
         String city = (String) tableData.get("city");

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -499,6 +500,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         List<JgChangeRegistrationUnit> list = new ArrayList<>();
         List<JgChangeRegistrationUnitEq> equipList = new ArrayList<>();
         String finalNextExecutorRoleIds = nextExecutorRoleIds;
+        CompanyBo companyBo = commonServiceImpl.getOneCompany(model.getReceiveCompanyCode());
         deviceList.forEach(obj -> {
             JgChangeRegistrationUnitEq jgRelationEquip = new JgChangeRegistrationUnitEq();
             JgChangeRegistrationUnit dto = new JgChangeRegistrationUnit();
@@ -506,6 +508,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             int i = deviceList.indexOf(obj);
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
+            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
             dto.setCreateUserId(RequestContext.getExeUserId());
             dto.setApplyDate(new Date());
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -680,7 +683,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 model.setReceiveOrgName(receiveOrgCodeList[1]);
             }
         }
-
     }
 
     private String convertImageUrl(List<Map<String, String>> urlList) {

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

@@ -612,6 +612,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     }
 
     private void businessData(String submitType, ReginParams reginParams, JgInstallationNoticeDto model, List<Map<String, Object>> deviceList, List<String> applyNoList, List<JgInstallationNotice> list, List<JgInstallationNoticeEq> equipList, List<WorkflowResultDto> workflowResultList) {
+        CompanyBo companyBo = commonService.getOneCompany(model.getReceiveOrgCreditCode());
         deviceList.forEach(obj -> {
             JgInstallationNoticeEq jgRelationEquip = new JgInstallationNoticeEq();
             JgInstallationNotice dto = new JgInstallationNotice();
@@ -620,6 +621,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            // 统计使用
+            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
                 dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
@@ -419,6 +420,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
         List<JgMaintainNotice> list = new ArrayList<>();
         List<JgMaintainNoticeEq> equipList = new ArrayList<>();
+        CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
         deviceList.forEach(obj -> {
             JgMaintainNoticeEq jgRelationEquip = new JgMaintainNoticeEq();
             JgMaintainNotice dto = new JgMaintainNotice();
@@ -426,6 +428,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             int i = deviceList.indexOf(obj);
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
+            // 统计使用
+            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
             dto.setNoticeDate(new Date());
             dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
             dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));

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

@@ -390,11 +390,14 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         }
         contractDto.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
         JgMaintenanceContract contract = new JgMaintenanceContract();
-        boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());// 没有id说明是新增
+        // 没有id说明是新增
+        boolean isNoId = StringUtils.isEmpty(contractDto.getSequenceNbr());
         BeanUtils.copyProperties(contractDto, contract);
         contract.setCreateUserId(reginParams.getUserModel().getUserId());
         contract.setCreateUserName(reginParams.getUserModel().getRealName());
-        if (hasId) {
+        CompanyBo companyBo = commonService.getOneCompany(contract.getReceiveOrgCode());
+        contract.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+        if (isNoId) {
             contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
             this.save(contract);
         } else {

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -372,6 +373,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         List<JgReformNotice> list = new ArrayList<>();
         List<JgReformNoticeEq> equipList = new ArrayList<>();
         List<String> finalApplyNoList = applyNoList;
+        CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
 
         deviceList.forEach(obj -> {
             JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
@@ -389,6 +391,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             dto.setSupervisoryCode(Objects.toString(obj.get("SUPERVISORY_CODE"), ""));
             dto.setEquList(Objects.toString(obj.get("EQU_LIST"), ""));
             dto.setFullAddress(Objects.toString(obj.get("ADDRESS"), ""));
+            // 统计用
+            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
 
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 WorkflowResultDto workflowResult = workflowResultList.get(i);

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

@@ -8,6 +8,7 @@ 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.github.pagehelper.util.StringUtil;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -450,6 +451,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * 组装业务数据
      */
     private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model, List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel, List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list, List<JgTransferNoticeEq> equipList) {
+        CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
         deviceList.forEach(obj -> {
             JgTransferNoticeEq jgRelationEquip = new JgTransferNoticeEq();
             JgTransferNotice dto = new JgTransferNotice();
@@ -460,6 +462,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            // 统计用
+            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
                 dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());

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

@@ -371,7 +371,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
             jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
             jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
-
+            jgUseRegistration.setReceiveCompanyOrgCode(commonService.getOneCompany(jgUseRegistration.getReceiveCompanyCode()).getOrgCode());
         }
         // 安全管理员
         if (map.containsKey("safetyManager")) {
@@ -556,6 +556,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 .ifPresent(splitReceiveOrgCode -> {
                     String orgCode = this.recursiveMatching(tree, splitReceiveOrgCode[0]);
                     useRegistration.setReceiveOrgCode(orgCode);
+                    useRegistration.setReceiveCompanyOrgCode(orgCode);
                     useRegistration.setReceiveCompanyCode(splitReceiveOrgCode[0]);
                     useRegistration.setReceiveOrgName(splitReceiveOrgCode[1]);
                 });