启用停用bug修改

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

@@ -16,7 +16,9 @@ import java.util.Map;
  */
 public interface JgEnableDisableMapper extends BaseMapper<JgEnableDisable> {
 
-    Page<Map<String, Object>> pageList(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgEnableDisableDto dto);
+    Page<Map<String, Object>> pageList(@Param("page") Page<Map<String, Object>> page,
+                                       @Param("dto") JgEnableDisableDto dto,
+                                       @Param("type") String type);
 
     Map<String, Object> getDetail(@Param("sequenceNbr") Long sequenceNbr);
 }

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

@@ -8,7 +8,7 @@
                date_format(jed.apply_date, '%Y-%m-%d')                                                       as applyDate,
                CASE
                    when
-                       jed.apply_type = 1 then '停用'
+                       jed.apply_type = 'SB_TY' then '停用'
                    else '启用' end                                                                             as applyType,
                jri.USE_ORG_CODE                                                                              as useOrgCode,
                (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY)                        as equCategory,
@@ -24,7 +24,8 @@
                jed.execute_sequence as executeSequence,
                jed.next_executor_ids as nextExecutorIds,
                jed.promoter,
-               jed.next_execute_user_ids as nextExecuteUserIds
+               jed.next_execute_user_ids as nextExecuteUserIds,
+               jed.create_user_id as createUserId
 
         FROM tzs_jg_enable_disable jed
                  LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
@@ -37,11 +38,12 @@
             <if test="dto.auditStatus != null and dto.auditStatus != '' ">
                 and  jed.audit_status = #{dto.auditStatus}
             </if>
-            <if test="dto.type == 'enterprise'">
-                and  jed.use_unit_credit_code = #{dto.useUnitCreditCode}
+            <if test="type != 'company'">
+                AND jed.instance_id is not null
+                and  jed.receive_company_code = #{dto.receiveCompanyCode}
             </if>
-            <if test="dto.type == 'supervision'">
-                and  jed.receive_org_code = #{dto.useUnitCreditCode}
+            <if test="type == 'company'">
+                and  jed.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
             <if test="dto.receiveOrgCode != null and dto.receiveOrgCode != ''">
                 and  jed.receive_org_code = #{dto.receiveOrgCode}
@@ -49,12 +51,6 @@
             <if test="dto.applyType != null and dto.applyType != ''">
                 and  jed.apply_type = #{dto.applyType}
             </if>
-
-            <if test="dto.roleIds != null and dto.type == 'supervision'">
-                <foreach collection='dto.roleIds' item='role' open='and (' close=')' separator='or'>
-                    execute_sequence like concat('%',#{role},'%')
-                </foreach>
-            </if>
         </where>
         order by jed.rec_date desc
     </select>

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

@@ -166,7 +166,7 @@ public class JgTransferNoticeController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "特种设备登记证导出", notes = "特种设备登记证导出")
+    @ApiOperation(httpMethod = "GET", value = "（测试使用）特种设备登记证导出", notes = "（测试使用）特种设备登记证导出")
     @GetMapping(value = "/certificate/report")
     public void generateCertificateReport(HttpServletResponse response) {
         Map<String, Object> map = new HashMap<>();

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

@@ -175,6 +175,10 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
             }
         } else {
+            jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
+            jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
+            jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
             jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
             jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
             jgEnableDisable.setRemark(map.get("remark") == null ? "" : map.get("remark").toString());
@@ -320,8 +324,13 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
 
     public Page<Map<String, Object>> pageList(Page<Map<String, Object>> page, JgEnableDisableDto dto) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-        return this.baseMapper.pageList(page, dto);
+        if ("company".equals(reginParams.getCompany().getLevel())) {
+            dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+        } else {
+            dto.setReceiveCompanyCode(reginParams.getCompany().getCompanyCode());
+        }
+        String level =  reginParams.getCompany().getLevel();
+        return this.baseMapper.pageList(page, dto, level);
     }