fix(jg):1，改造告知列表查询修改，车用气瓶检验单位和安装单位兼容旧系统数据

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

@@ -4,6 +4,11 @@
 
     <select id="queryForPage" resultType="java.util.Map">
         select
+        isn.province,
+        isn.city,
+        isn.county,
+        isn.street,
+        isn.promoter,
         isn.sequence_nbr AS sequenceNbr,
         isn.apply_no AS applyNo,
         isn.use_unit_name AS useUnitName,
@@ -12,16 +17,10 @@
         isn.notice_status AS noticeStatus,
         isn.install_unit_name AS installUnitName,
         isn.province_name AS provinceName,
-        isn.province,
-        isn.city,
-        isn.county,
-        isn.street,
-        isn.promoter,
-        isn.notice_report_url,
-        isn.equ_list_code,
-        isn.equ_category,
-        isn.create_user_id,
-        isn.next_execute_user_ids,
+        isn.notice_report_url AS noticeReportUrl,
+        isn.equ_list_code as equListCode,
+        isn.create_user_id as createUserId,
+        isn.next_execute_user_ids as nextExecuteUserIds,
         isn.instance_id AS instanceId,
         isn.city_name AS cityName,
         isn.county_name AS countyName,
@@ -29,6 +28,7 @@
         isn.receive_company_code AS receiveCompanyCode,
         isn.receive_org_name AS receiveOrgName,
         isn.next_execute_ids as nextExecuteIds,
+        isn.instance_status AS instanceStatus,
         isn.inform_number AS informNumber,
         isn.equ_category AS equCategory,
         isn.next_task_id as nextTaskId,

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

@@ -126,8 +126,9 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUnitList")
     @ApiOperation(httpMethod = "GET", value = "通过单位类型获取单位列表", notes = "通过单位类型获取单位列表")
-    public ResponseModel<List<Map<String, Object>>> getUnitList(@RequestParam(value = "type") String type) {
-        return ResponseHelper.buildResponse(commonService.getUnitListByType(type));
+    public ResponseModel<List<Map<String, Object>>> getUnitList(@RequestParam(value = "type") String type,
+                                                                @RequestParam(value = "business",required = false) String business) {
+        return ResponseHelper.buildResponse(commonService.getUnitListByType(type,business));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -32,7 +32,7 @@ public interface ICommonService {
 
     List<LinkedHashMap> creatTree();
 
-    List<Map<String, Object>> getUnitListByType(String type);
+    List<Map<String, Object>> getUnitListByType(String type, String business);
 
     List<Map<String, Object>> getSecurityAdmin(String type, String useUnitCode);
 
@@ -77,8 +77,9 @@ public interface ICommonService {
 
     /**
      * 使用标志生成
-     * @param  useFlagParamDto 参数
-     * @param response 文件信息
+     *
+     * @param useFlagParamDto 参数
+     * @param response        文件信息
      */
     void useFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response);
 
@@ -86,7 +87,8 @@ public interface ICommonService {
 
     /**
      * 执行流程时前置校验
-     * @param taskId 任务id
+     *
+     * @param taskId     任务id
      * @param instanceId 实例id
      */
     void checkForExecuteFlow(String taskId, String instanceId);
@@ -94,14 +96,16 @@ public interface ICommonService {
 
     /**
      * 最新流程数据缓存
-     * @param instanceId 实例id
+     *
+     * @param instanceId   实例id
      * @param instanceData 流程数据
      */
     void saveExecuteFlowData2Redis(String instanceId, InstanceRuntimeData instanceData);
 
     /**
      * 撤回时校验
-     * @param taskId 前端业务上送任务id
+     *
+     * @param taskId     前端业务上送任务id
      * @param instanceId 实例id
      */
     void checkForRevocationFlow(String taskId, String instanceId);
@@ -109,9 +113,10 @@ public interface ICommonService {
 
     /**
      * 创建或者更新历史表
+     *
      * @param registrationClass 分类
-     * @param map 过程数据
-     * @param equipId 设备唯一标识
+     * @param map               过程数据
+     * @param equipId           设备唯一标识
      * @param currentDocumentId 业务id
      */
     void saveOrUpdateHistory(String registrationClass, JSON map, String equipId, String currentDocumentId);
@@ -119,6 +124,7 @@ public interface ICommonService {
 
     /**
      * 查询历史数据
+     *
      * @param currentDocumentId 业务id
      * @return JSONObject
      */
@@ -126,6 +132,7 @@ public interface ICommonService {
 
     /**
      * 查询历史数据: 通用
+     *
      * @param currentDocumentId 业务id
      * @return Object
      */
@@ -133,6 +140,7 @@ public interface ICommonService {
 
     /**
      * 统计指定设备流程中的引用次数（12个流程中，非待提交、非已撤回、非已驳回）
+     *
      * @param record 设备唯一标识
      * @return 被引用次数 > 0 则设备不可编辑
      */
@@ -141,6 +149,7 @@ public interface ICommonService {
 
     /**
      * 统计设备被引用的次数（只有存在就算引用）
+     *
      * @param record 设备唯一标识
      * @return 被引用次数 > 0 则设备不可删除
      */
@@ -148,6 +157,7 @@ public interface ICommonService {
 
     /**
      * 设备分类
+     *
      * @param type 1，设备种类  2，设备类别  3，设备品种
      * @return
      */
@@ -155,8 +165,9 @@ public interface ICommonService {
 
     /**
      * 套打使用标志生成
-     * @param  useFlagParamDto 参数
-     * @param response 文件信息
+     *
+     * @param useFlagParamDto 参数
+     * @param response        文件信息
      */
     void fightUseFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response);
 
@@ -168,6 +179,7 @@ public interface ICommonService {
 
     /**
      * 公司详情
+     *
      * @param companyCode 公司编码
      * @return CompanyBo
      */