根据成果id查询审批记录接口提交

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/cggl/CgglController.java

@@ -209,7 +209,7 @@ public class CgglController extends BaseController {
      * @return
      */
     @PostMapping("/complete")
-    public JSONObject complete(String md5,String filename, String type, String reason, String instid) {
+    public JSONObject complete(String md5, String filename, String type, String reason, String instid) {
         JSONObject jsonObject = JSONObject.parseObject("{\n" +
                 "  \"statuscode\": 200,\n" +
                 "  \"data\": null,\n" +
@@ -226,7 +226,7 @@ public class CgglController extends BaseController {
      */
     @PostMapping("/uploadSplitFile")
     public JSONObject uploadSplitFile(String md5,
-                                      Integer chunk,MultipartFile file) {
+                                      Integer chunk, MultipartFile file) {
         JSONObject jsonObject = new JSONObject();
         String chunkDirPath = temp + File.separator + "test_interface";
         // 用于存储文件分片的文件夹
@@ -319,6 +319,7 @@ public class CgglController extends BaseController {
         }
         return jsonObject;
     }
+
     /**
      * 获取成果审查信息
      *
@@ -326,9 +327,8 @@ public class CgglController extends BaseController {
      * @return
      */
     @GetMapping("/getCgSclist")
-    public RequestResult getCgSclist(String type,int page,int num)
-    {
-        RequestResult res = cgglService.getCgSclist(type,page,num);
+    public RequestResult getCgSclist(String type, int page, int num) {
+        RequestResult res = cgglService.getCgSclist(type, page, num);
         return res;
     }
 
@@ -339,10 +339,9 @@ public class CgglController extends BaseController {
      * @return
      */
     @GetMapping("/selectCgSclist")
-    public RequestResult selectCgSclist(String type,int page,int num,String xzqdm,String cgmc,String cglx)
-    {
+    public RequestResult selectCgSclist(String type, int page, int num, String xzqdm, String cgmc, String cglx) {
         //旗县 上传成功的
-        RequestResult res = cgglService.selectCgSclist(type,page,num,xzqdm,cgmc,cglx);
+        RequestResult res = cgglService.selectCgSclist(type, page, num, xzqdm, cgmc, cglx);
         return res;
     }
 
@@ -402,4 +401,16 @@ public class CgglController extends BaseController {
         RequestResult res = cgglService.startcgsc(cgscDto.getScmodel(), cgscDto.getJqscmodel(), cgscDto.getCgid());
         return res;
     }
+
+    /**
+     * 根据成果id查询审批记录
+     *
+     * @param cgid
+     * @return
+     */
+    @RequestMapping("/viewscjl")
+    public RequestResult viewscjl(String cgid) {
+        RequestResult res = cgglService.viewscjl(cgid);
+        return res;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/cggl/CgglService.java

@@ -49,4 +49,6 @@ public interface CgglService {
     RequestResult getScmxList(String name);
 
     RequestResult startcgsc(String scmodel, String jqscmodel, String cgid);
+
+    RequestResult viewscjl(String cgid);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/cggl/CgglServiceImpl.java

@@ -254,6 +254,15 @@ public class CgglServiceImpl implements CgglService {
         return RequestResult.error("发起审查失败！");
     }
 
+    @Override
+    public RequestResult viewscjl(String cgid) {
+        QueryWrapper<ScmxRecordDTO> wrapper = new QueryWrapper();
+        wrapper.eq("cgid", cgid);
+        wrapper.orderByAsc("sort");
+        List<ScmxRecordDTO> res = scmxRecordMapper.selectList(wrapper);
+        return RequestResult.success("查询成功！", res);
+    }
+
     @Override
     public List<EscalationInfoDTO> cgInfoList(String year, String xzqdm, String uploadstatus, String username, String cglevel, String plantype) {
         //判断是否为市级用户查看旗县数据，需要过滤uploadstatus != '0'
@@ -613,7 +622,7 @@ public class CgglServiceImpl implements CgglService {
         }
         //判断为id数值还是直接传递的路径
         String fileDir = "";
-        if (id.contains("/")|| id.contains("\\") ) {
+        if (id.contains("/") || id.contains("\\")) {
             fileDir = id.substring(0, id.lastIndexOf("."));
         } else {
             QueryWrapper<EscalationDTO> EscalationQrapper = new QueryWrapper<>();

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/cggl/EscalationMapper.xml

@@ -196,6 +196,12 @@
         '详细规划'
         when t.plantype = '5' then
         '专项规划'
+        when t.plantype = '6' then
+        '报批项目'
+        when t.plantype = '7' then
+        '苏木乡镇规划'
+        when t.plantype = '8' then
+        '城市更新'
         end) as "plantype",
         t.fileid as "fileid",
         (case
@@ -278,6 +284,12 @@
         '详细规划'
         when t.plantype = '5' then
         '专项规划'
+        when t.plantype = '6' then
+        '报批项目'
+        when t.plantype = '7' then
+        '苏木乡镇规划'
+        when t.plantype = '8' then
+        '城市更新'
         end) as "plantype",
         t.fileid as "fileid",
         (case