电梯注销业务开发bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java

@@ -3,6 +3,11 @@ package com.yeejoin.amos.boot.module.jg.api.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 使用登记状态西悉尼
  */
@@ -72,4 +77,25 @@ public enum WorkFlowStatusEnum {
         }
         return null;
     }
+
+    public static List<Map<String, String>> getInfoList(String code) {
+        List<Map<String, String>> resultList = new ArrayList<>();
+        for (WorkFlowStatusEnum constants : values()) {
+            if (constants.getCode().startsWith(code)) {
+                HashMap<String, String> hashMap = new HashMap<>();
+                hashMap.put("name", constants.getPass());
+                hashMap.put("value", constants.getPass());
+                resultList.add(hashMap);
+                HashMap<String, String> hashMap1 = new HashMap<>();
+                hashMap1.put("name", constants.getReject());
+                hashMap1.put("value", constants.getReject());
+                resultList.add(hashMap1);
+                HashMap<String, String> hashMap2 = new HashMap<>();
+                hashMap2.put("name", constants.getRollBack());
+                hashMap2.put("value", constants.getRollBack());
+                resultList.add(hashMap2);
+            }
+        }
+        return resultList;
+    }
 }

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

@@ -49,13 +49,13 @@
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
-<!--            <if test="dto.equCode != null and dto.equCode != ''">-->
-<!--                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
-<!--            </if>-->
-<!--            <if test="dto.useUnitName != null and dto.useUnitName != ''">-->
-<!--                and  use.USE_UNIT_NAME like concat('%',#{dto.useUnitName},'%')-->
-<!--            </if>-->
-<!--             -->
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and ur.apply_no like concat('%',#{dto.applyNo},'%')
+            </if>
+            <if test="dto.cancelType != null and dto.cancelType != ''">
+                and  ur.cancel_type like concat('%',#{dto.cancelType},'%')
+            </if>
+
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     ur.instance_status like concat('%',#{role},'%')

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgScrapCancelServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -96,7 +97,7 @@ public class JgScrapCancelController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
     @PostMapping(value = "/getList")
-    public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
+    public ResponseModel<Page<Map<String, Object>>> getList(@RequestBody JgScrapCancelDto dto,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
@@ -131,4 +132,12 @@ public class JgScrapCancelController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表筛选办理状态下拉", notes = "列表筛选办理状态下拉")
+    @GetMapping(value = "/getAuditStatusList")
+    public ResponseModel<List<Map<String, String>>> getAuditStatusList(@RequestParam(value = "code") String code) {
+        return ResponseHelper.buildResponse(WorkFlowStatusEnum.getInfoList(code));
+    }
+
+
 }