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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -28,15 +28,15 @@ public class BaseController {
     @Autowired
     protected HttpServletRequest request;
 
-    /**
-     * 企业
-     */
-    public static final String COMPANY_TYPE_COMPANY = "company";
 
     /**
      * 监管/行政审批局
      */
     public static final String COMPANY_TYPE_SUPERVISION = "supervision";
+    /**
+     * 企业
+     */
+    public static final String COMPANY_TYPE_COMPANY = "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/JgUseRegistrationServiceImpl.java

@@ -2134,12 +2134,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
             LambdaQueryWrapper<IdxBizJgProjectContraption> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(BaseEntity::getSequenceNbr, jgUseRegistration.getProjectContraptionId());
-            queryWrapper.select(IdxBizJgProjectContraption::getEquListName,IdxBizJgProjectContraption::getEquCategoryName,IdxBizJgProjectContraption::getEquDefineName,BaseEntity::getSequenceNbr);
+            queryWrapper.select(IdxBizJgProjectContraption::getEquListName,
+                    IdxBizJgProjectContraption::getEquCategoryName,
+                    IdxBizJgProjectContraption::getEquDefineName,
+                    BaseEntity::getSequenceNbr,
+                    IdxBizJgProjectContraption::getEquList,
+                    IdxBizJgProjectContraption::getEquCategory,
+                    IdxBizJgProjectContraption::getEquDefine);
             IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getBaseMapper().selectOne(queryWrapper);
             if(projectContraption != null){
                 detail.put("equListName", projectContraption.getEquListName());
                 detail.put("equCategoryName", projectContraption.getEquCategoryName());
                 detail.put("equDefineName", projectContraption.getEquDefineName());
+                detail.putIfAbsent("EQU_LIST_CODE", projectContraption.getEquList());
+                detail.putIfAbsent("EQU_CATEGORY_CODE", projectContraption.getEquCategory());
+                detail.putIfAbsent("EQU_DEFINE_CODE", projectContraption.getEquDefine());
             }
         }
     }