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

@@ -89,4 +89,25 @@ public class JgEquipTransferDto  extends BaseDto {
     @TableField(exist = false)
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty(value = "设备品种")
+    private String equDefine;
+
+    @ApiModelProperty(value = "设备出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "设备注册代码")
+    private String equRegisterCode;
+
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "单位内编号")
+    private String useInnerCode;
+
+    @ApiModelProperty(value = "设备地址")
+    private String concatenatedAddress;
 }

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

@@ -142,4 +142,25 @@ public class JgEquipTransfer extends BaseEntity {
     @TableField(value = "instance_roles")
     private String instanceRoles;
 
+    @TableField(exist = false)
+    private String equCategory;
+
+    @TableField(exist = false)
+    private String equDefine;
+
+    @TableField(exist = false)
+    private String factoryNum;
+
+    @TableField(exist = false)
+    private String equRegisterCode;
+
+    @TableField(exist = false)
+    private String supervisoryCode;
+
+    @TableField(exist = false)
+    private String useInnerCode;
+
+    @TableField(exist = false)
+    private String concatenatedAddress;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgEquipTransferService.java

@@ -33,7 +33,7 @@ public interface IJgEquipTransferService  extends IService<JgEquipTransfer> {
      * @param sequenceNbr 主键
      * @return 设备移交详情
      */
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Object> queryBySequenceNbr(Long sequenceNbr);
 
     /**
      * 保存设备移交接口

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

@@ -22,9 +22,49 @@
             jet.execute_sequence AS executeSequence,
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
-            jet.task_name AS taskName
+            jet.task_name AS taskName,
+            ri.equ_list AS equList,
+            ri.equ_category AS equCategory,
+            ri.equ_define AS equDefine,
+            ri.product_name AS productName,
+            ri.brand_name AS brandName,
+            ri.equ_type AS equType,
+            ri.equ_price AS equPrice,
+            ri.product_photo AS productPhoto,
+            di.design_unit_credit_code AS designUnitCreditCode,
+            di.design_unit_name AS designUnitName,
+            di.design_license_num AS designLicenseNum,
+            di.design_use_date AS designUseDate,
+            di.design_date AS designDate,
+            di.drawing_do AS drawingDo,
+            di.appraisal_unit AS appraisalUnit,
+            di.appraisal_date AS appraisalDate,
+            di.design_doc AS designDoc,
+            di.design_standard AS designStandard,
+            fi.produce_unit_credit_code AS produceUnitCreditCode,
+            fi.produce_unit_name AS produceUnitName,
+            fi.produce_license_num AS produceLicenseNum,
+            fi.factory_num AS factoryNum,
+            fi.produce_date AS produceDate,
+            fi.imported AS imported,
+            fi.produce_country AS produceCountry,
+            fi.factory_standard AS factoryStandard,
+            fi.product_quality_yield_prove AS productQualityYieldProve,
+            fi.ins_use_maintain_explain AS insUseMaintainExplain,
+            ui.safety_manager AS safetyManager,
+            ui.phone AS safetyManagerPhone,
+            CONCAT(ui.PROVINCE_NAME,'', ui.CITY_NAME, ' ', ui.COUNTY_NAME, ' ', ui.ADDRESS, ' ', ui.street_name) AS concatenatedAddress,
+            ui.USE_INNER_CODE AS useInnerCode,
+            oi.SUPERVISORY_CODE AS supervisoryCode
         FROM
             tzs_jg_equip_transfer jet
+            LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
+            LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_other_info oi ON oi.record = ete.equ_id
         <where>
             jet.is_delete = false
             <if test="param != null ">
@@ -67,7 +107,7 @@
             jet.execute_sequence AS executeSequence,
             jet.instance_status AS instanceStatus,
             jet.accept_date AS acceptDate,
-            jet.task_name AS taskName
+            jet.task_name AS taskName,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.equ_define AS equDefine,
@@ -104,12 +144,12 @@
             ui.ADDRESS AS useUnitAddress
         FROM
             tzs_jg_equip_transfer jet
-                LEFT JOIN tzs_jg_equip_transfer_eq ete ON re.equip_transfer_id = jet.sequence_nbr
-                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
-                LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
-                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
-                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
-                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
+            LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
+            LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
+            LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
         WHERE
             jet.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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

@@ -55,14 +55,18 @@
 <!--            <if test="dto.useUnitName != null and dto.useUnitName != ''">-->
 <!--                and  use.USE_UNIT_NAME like concat('%',#{dto.useUnitName},'%')-->
 <!--            </if>-->
+<!--             -->
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                    ur.audit_status like concat('%',#{role},'%')
+                    ur.instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
             <if test="dto.type == 'supervision'">
                 AND ur.receive_org_code = #{orgCode}
             </if>
+            <if test="dto.type == 'enterprise' ">
+                and ur.use_unit_code = #{orgCode}
+            </if>
 <!--            <if test="dto.type == 'enterprise'">-->
 <!--                AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
 <!--            </if>-->

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

@@ -31,8 +31,6 @@ public class JgEquipTransferByWorkFlowController extends BaseController {
     @Autowired
     JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
 
-    private static final String TABLE_PAGE_ID = "1734141426742095873";
-
     /**
      * 受理
      *
@@ -41,10 +39,7 @@ public class JgEquipTransferByWorkFlowController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/accept")
     @ApiOperation(httpMethod = "POST", value = "设备移交受理", notes = "设备移交受理")
-    public ResponseModel<JgEquipTransferDto> accept(@RequestBody Map<String, Object> model, String op) {
-        LinkedHashMap model1 = (LinkedHashMap)model.get("model");
-        LinkedHashMap equipTransferInfo = (LinkedHashMap)model1.get(TABLE_PAGE_ID);
-        JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(equipTransferInfo), JgEquipTransferDto.class);
+    public ResponseModel<JgEquipTransferDto> accept(@RequestBody JgEquipTransferDto jgEquipTransferDto, String op) {
         jgEquipTransferServiceImpl.accept(jgEquipTransferDto,op);
         return ResponseHelper.buildResponse(null);
     }
@@ -57,13 +52,9 @@ public class JgEquipTransferByWorkFlowController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/cancel")
     @ApiOperation(httpMethod = "POST", value = "设备移交撤销", notes = "设备移交撤销")
-    public ResponseModel<JgEquipTransferDto> cancel(@RequestBody Map<String, Object> model) {
-        JgEquipTransferDto equipTransferInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get(TABLE_PAGE_ID)), JgEquipTransferDto.class, true);
-        if (Objects.isNull(equipTransferInfo)) {
-            throw new IllegalArgumentException("参数equipTransferInfo不能为空");
-        }
-        jgEquipTransferServiceImpl.cancel(equipTransferInfo);
-        return ResponseHelper.buildResponse(equipTransferInfo);
+    public ResponseModel<JgEquipTransferDto> cancel(@RequestBody JgEquipTransferDto jgEquipTransferDto) {
+        jgEquipTransferServiceImpl.cancel(jgEquipTransferDto);
+        return ResponseHelper.buildResponse(null);
     }
 }
 

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
+import com.yeejoin.amos.boot.module.jg.api.common.BaseException;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.*;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +35,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @RequestMapping(value = "/jg-equip-transfer")
 public class JgEquipTransferController extends BaseController {
 
-    private static final String TABLE_PAGE_ID = "1734141426742095873";
-
     @Autowired
     JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
 
@@ -44,19 +46,17 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
-    public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, JgEquipTransferDto> modelMap) {
-        jgEquipTransferServiceImpl.saveOrUpdateModel(submitType, modelMap.get(TABLE_PAGE_ID), getSelectedOrgInfo());
+    public ResponseModel<Object> save(@RequestParam("submitType") String submitType, @RequestBody JgEquipTransferDto model) {
+        jgEquipTransferServiceImpl.saveOrUpdateModel(submitType, model, getSelectedOrgInfo());
         return ResponseHelper.buildResponse("ok");
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备移交", notes = "根据sequenceNbr更新设备移交")
-    public ResponseModel<JgEquipTransferDto> updateBySequenceNbr(@RequestParam String submitType, @RequestBody Map<String, Object> modelMap, @RequestParam(value = "op", required = false) String op) {
-        JgEquipTransferDto equipTransferDto = BeanUtil.mapToBean(((LinkedHashMap) modelMap.get(TABLE_PAGE_ID)), JgEquipTransferDto.class, true);
-        if (Objects.isNull(equipTransferDto)) {
-            throw new IllegalArgumentException("参数equipTransferDto不能为空");
-        }
+    public ResponseModel<JgEquipTransferDto> updateBySequenceNbr(@RequestParam("submitType") String submitType,
+                                                                 @RequestBody JgEquipTransferDto equipTransferDto,
+                                                                 @RequestParam(value = "op", required = false) String op) {
         return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.updateEquipTransfer(submitType, equipTransferDto, op));
     }
 
@@ -68,7 +68,7 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除设备移交", notes = "根据sequenceNbr删除设备移交")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.removeById(sequenceNbr));
     }
 
@@ -81,7 +81,7 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/deleteBatch")
     @ApiOperation(httpMethod = "DELETE", value = "批量删除设备移交", notes = "批量删除设备移交")
-    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam String ids) {
+    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam("ids") String ids) {
         if (StringUtils.isEmpty(ids)) {
             throw new RuntimeException("请选择需要删除的行！");
         }
@@ -97,7 +97,7 @@ public class JgEquipTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个设备移交", notes = "根据sequenceNbr查询单个设备移交")
-    public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
+    public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr));
     }
 
@@ -113,10 +113,35 @@ public class JgEquipTransferController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "设备移交分页查询", notes = "设备移交分页查询")
     public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                 @RequestParam(value = "size") int size,
-                                                                @ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
+                                                                @ApiParam(value = "类型：useUnit-使用单位、installUnit-施工单位", required = true) @RequestParam(value = "type", defaultValue = "useUnit") String type,
                                                                 @RequestBody(required = false) JgEquipTransferDto dto) {
         Page<JgEquipTransfer> page = new Page<>(current, size);
         return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, type, getSelectedOrgInfo()));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getCodeAndName")
+    @ApiOperation(httpMethod = "GET", value = "获取当前登录用户所在公司code和公司名称", notes = "获取当前登录用户所在公司code和公司名称")
+    public ResponseModel<Map<String, Object>> getCodeAndName() {
+
+        List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
+        if (companyModels.isEmpty()) {
+            throw new BaseException("未指定人员归属单位信息");
+        }
+        String companyType = companyModels.get(0).getCompanyType();
+        String companyCode = companyModels.get(0).getCompanyCode();
+        String companyName = companyModels.get(0).getCompanyName();
+        Map<String, Object> map = new HashMap<>();
+        if("个人主体".equals(companyType)){
+            map.put("useUnitName", companyName.split("_")[1]);
+            map.put("useUnitCreditCode", companyCode.split("_")[1]);
+            map.put("companyType", "person");
+        } else {
+            map.put("useUnitName", companyName);
+            map.put("useUnitCreditCode", companyCode);
+            map.put("companyType", "company");
+        }
+        return ResponseHelper.buildResponse(map);
+    }
 }
 

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

@@ -861,7 +861,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
-            result.put(underscoreFieldName.toUpperCase(), value);
+            if(!ValidationUtil.isEmpty(value)){
+                result.put(underscoreFieldName.toUpperCase(), value);
+            }
         }
         return result;
     }

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

@@ -160,8 +160,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
             dto.setInstanceStatus(String.join(",", roleListFirst));
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyStatus(taskName[0]);
-            dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
-            dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgEquipTransferEq.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgEquipTransferEq.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(instanceIdList)) {
@@ -187,15 +185,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
     private void convertField(JgEquipTransferDto model) {
         if (null == model)
             return;
-        // 分割单位
-        String useUnitId = model.getUseUnitCreditCode();
-        if (!ObjectUtils.isEmpty(useUnitId)) {
-            String[] useUnitList = useUnitId.split("_");
-            if (useUnitList.length > 1) {
-                model.setUseUnitCreditCode(useUnitList[0]);
-                model.setUseUnitName(useUnitList[1]);
-            }
-        }
         //  分割接收机构
         String installUnitId = model.getInstallUnitCreditCode();
         if (!ObjectUtils.isEmpty(installUnitId)) {
@@ -287,7 +276,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
     }
 
     @Override
-    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+    public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
         JgEquipTransfer equipTransfer = this.baseMapper.selectById(sequenceNbr);
 
         if (Objects.isNull(equipTransfer)) {
@@ -305,11 +294,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
         handleJsonArrayFields(equipTransferInfo, fields);
         handleJsonArrayFields(equipmentInfos.get(0), fields);
 
-        Map<String, Map<String, Object>> result = new HashMap<>();
-        result.put("installationInfo", equipTransferInfo);
-        result.put("equipmentInfo", equipmentInfos.get(0));
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("transferInfo", equipmentInfos.get(0));
 
-        return result;
+        equipTransferInfo.forEach((key, value) -> resultMap.computeIfAbsent(key, k -> value));
+        return  resultMap;
     }
 
     @Override
@@ -320,8 +309,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
 
     private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
         Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
-        equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
-        equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
+        //equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
+        //equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
         return equipTransferInfo;
     }
 

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

@@ -386,9 +386,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             if (submit) {
                 // 查询下节点任务
                 getNext(roleListSecond, jgScrapCancel.getInstanceId(), taskName);
+
+                String join = String.join(",", roleListSecond);
                 jgScrapCancel.setStatus(taskName[0]);
                 if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
-                    jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + roleListSecond);
+                    jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + join);
                 } else {
                     jgScrapCancel.setInstanceStatus(String.join(",", roleListSecond));
                 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -149,4 +149,7 @@ public class JyjcInspectionResultModel extends BaseModel {
 
     @ApiModelProperty(value = "报检单位")
     private String applicationUnitName;
+
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -74,7 +74,7 @@
             and biz_type = #{bizType}
         </if>
         </where>
-        order by tzjia.application_date desc
+        order by tzjia.application_no desc
     </select>
     <select id="listByCategory"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel">

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -10,10 +10,10 @@
         res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
         res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
         res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
-         tec1.name equ_list_name, ibjri.equ_category
+         tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode
         , use_org_code, res.equ_define, ibjui.ADDRESS equUseAddress, bei.use_unit inspectionUnitName, bei1.use_unit applicationUnitName, cdb.name inspectionTypeName
         from tz_jyjc_inspection_result res
---         left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.supervisory_code
+        left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.record
         left join idx_biz_jg_use_info ibjui on ibjui.record = res.equip_unicode
         left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
         left join tz_equipment_category tec on ibjri.equ_category = tec.code