Merge remote-tracking branch 'origin/master'

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/enums/ProgressEnum.java

@@ -5,7 +5,13 @@ import lombok.Getter;
 @Getter
 public enum ProgressEnum {
 
-    START(0, "开始");
+    START(0, "开始"),
+    ALARM_TICKET_ISSUE(1, "预/告警单下发"),
+    FEEDBACK_UPLOAD(2, "反馈单上传"),
+    TEST_REPORT(3, "现场测试"),
+    REVISE_NOTICE_ISSUE(4, "整改通知单下发"),
+    REVISE_FEEDBACK(5, "整改通知单反馈"),
+    END(6, "完结");
 
     private final Integer code;
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java

@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -93,5 +95,14 @@ public class ThsSuperviseController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
 
     }
+
+    @ApiOperation("查询流程状态列表")
+    @PostMapping("/queryProgressValues")
+    public HttpResult queryProgressValues() {
+        List<Map<Integer, String>> values = thsSuperviseService.queryProgressValues();
+        String methodDescribe = getMethodDescribe("queryProgressValues");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, values, methodDescribe);
+
+    }
 }
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ThsSuperviseMapper.xml

@@ -4,7 +4,7 @@
     <!--查询技术监督列表-->
     <select id="querySuperviseList" parameterType="com.njcn.prepare.harmonic.pojo.dto.SuperviseDto"
             resultType="com.njcn.prepare.harmonic.pojo.vo.SuperviseVo">
-        select ts.* from ths_supervise ts where ts.name like CONCAT(CONCAT('%', #{param.searchValue}), '%')
+        select ts.* from ths_supervise ts where 1=1
         <if test="param.searchBeginTime != null and param.searchBeginTime != ''">
             AND DATE_FORMAT(ts.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')
         </if>

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java

@@ -311,6 +311,17 @@ public class ThsSuperviseServiceImpl extends ServiceImpl<ThsSuperviseMapper, Ths
         }
     }
 
+    @Override
+    public List<Map<Integer, String>> queryProgressValues() {
+        List<Map<Integer, String>> list = new ArrayList<>();
+        Arrays.asList(ProgressEnum.values()).forEach(value -> {
+            Map<Integer, String> progress = new HashMap<>();
+            progress.put(value.getCode(), value.getMessage());
+            list.add(progress);
+        });
+        return list;
+    }
+
 
     /**
      * 查询策略列表

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ThsSuperviseService.java

@@ -127,4 +127,11 @@ public interface ThsSuperviseService extends IService<ThsSupervise> {
      * @param response
      */
     void uploadSuperviseTicket(String id, String ticketType, MultipartFile[] files, HttpServletResponse response);
+
+    /**
+     * 查询流程状态枚举列表
+     * @return
+     */
+    List<Map<Integer, String>> queryProgressValues();
+
 }