Browse Source

等级评定结果受理

953954216 5 months ago
parent
commit
a0a3baa03d

+ 14 - 9
ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/DjpdJglrServiceImpl.java

@@ -329,16 +329,21 @@ public class DjpdJglrServiceImpl implements IDjpdJglrService
 
     @Override
     public int updateDjpdSl(DjpdJglr djpdJglr) {
-        Map<String, String> var = new HashMap<>();
-        if (StringUtils.equals(djpdJglr.getSljg(), ExamineStatus.YES.getCode())) {
-            var.put("pass", ExamineStatus.YES.getCode());
-            var.put("comment", ApplicationStatus.ACCEPT.getCode() + ExamineStatus.YES.getCode() + djpdJglr.getSljy());
-        } else {
-            var.put("pass", ExamineStatus.NO.getCode());
-            var.put("comment", ApplicationStatus.ACCEPT.getCode() + ExamineStatus.NO.getCode() + djpdJglr.getSljy());
+//        Map<String, String> var = new HashMap<>();
+//        if (StringUtils.equals(djpdJglr.getSljg(), ExamineStatus.YES.getCode())) {
+//            var.put("pass", ExamineStatus.YES.getCode());
+//            var.put("comment", ApplicationStatus.ACCEPT.getCode() + ExamineStatus.YES.getCode() + djpdJglr.getSljy());
+//        } else {
+//            var.put("pass", ExamineStatus.NO.getCode());
+//            var.put("comment", ApplicationStatus.ACCEPT.getCode() + ExamineStatus.NO.getCode() + djpdJglr.getSljy());
+//        }
+////        complete(djpdJglr.getTaskId(), djpdJglr.getInstanceId(), var);
+//        djpdJglr.setSqzt(definitionService.getDjpdSqztByInstanceId(djpdJglr.getInstanceId()));
+        if("01".equals(djpdJglr.getSljg())){
+            djpdJglr.setSqzt("02");
+        }else {
+            djpdJglr.setSqzt("21");
         }
-        complete(djpdJglr.getTaskId(), djpdJglr.getInstanceId(), var);
-        djpdJglr.setSqzt(definitionService.getDjpdSqztByInstanceId(djpdJglr.getInstanceId()));
         djpdJglr.setSzxzqh(null);
         return djpdJglrMapper.updateById(djpdJglr);
     }

+ 3 - 3
ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/DjpdJglrController.java

@@ -145,9 +145,9 @@ public class DjpdJglrController extends BaseController
     @PutMapping("/sl")
     public AjaxResult editSl(@Validated @RequestBody DjpdJglr djpdJglr)
     {
-        if (StringUtils.isEmpty(djpdJglr.getTaskId())) {
-            return AjaxResult.error("无效的受理");
-        }
+//        if (StringUtils.isEmpty(djpdJglr.getTaskId())) {
+//            return AjaxResult.error("无效的受理");
+//        }
         return toAjax(djpdJglrService.updateDjpdSl(djpdJglr));
     }