approve

easydo-chengfa/src/main/java/easydo/technology/controller/PurchasePlanController.java

@@ -204,6 +204,41 @@ public class PurchasePlanController {
         }
     }
 
+    @WebLog
+    @RequestMapping(value = "/resubmit")
+    public Object resubmit(@RequestBody PurchasePlan model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            GLDApproveVo vo = new GLDApproveVo();
+            vo.setTargetId(0);
+            vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_PLAN.getValue());
+            vo.setTemplateId(model.getTemplateId());
+            vo.setTaskId(model.getProcessTaskId());
+            String taskId = gldApproveService.restartApprove(vo);
+            vo.setTaskId(taskId);
+            vo = gldApproveService.getApproveInfo(vo);
+
+            model.setProcessInstanceId(vo.getInstanceId());
+            model.setProcessState(vo.getState());
+            model.setProcessTaskId(vo.getTaskId());
+            model.setProcessTemplateId(vo.getTemplateId());
+
+            model.setStatus(ChengfaEnum.PURCHASE_PALN_STATUS_APPROVE.getValue());
+            jdbcClient.jdbcUpdateById(model, connection);
+
+            connection.commit();
+            return new ResponseEntity<>(model, HttpStatus.OK);
+        } catch (Exception e) {
+            connection.rollback();
+            throw e;
+        } finally {
+            jdbcClient.finallyExecute(connection);
+        }
+    }
+
     @WebLog
     @RequestMapping(value = "/update")
     public Object update(@RequestBody PurchasePlan model) throws Exception {

easydo-chengfa/src/main/java/easydo/technology/service/GLDApproveService.java

@@ -64,7 +64,7 @@ public class GLDApproveService {
         object.put("targetId", vo.getTargetId());
         object.put("taskType", "APPROVAL");
         object.put("hiddenResubmit", true);
-        object.put("startorId", member.getId());
+        object.put("startorId", member.getUserId());
         String uuid = UUID.randomUUID().toString();
         log.info(uuid + "发起审批流req========>" + object.toJSONString() + ",url========>" + url);
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, object.toJSONString(), header);
@@ -72,6 +72,37 @@ public class GLDApproveService {
         return resObj.getString("id");
     }
 
+    public String restartApprove(GLDApproveVo vo) throws Exception {
+        Long userId = SecurityUtils.getCurrentUserId();
+        SysUser user = new SysUser();
+        user.setUserId(userId);
+        user = jdbcClient.getJdbcModel(user);
+        GldMember member = new GldMember();
+        member.setPhone(user.getPhone());
+        member = jdbcClient.getJdbcModel(member);
+
+        String url = (host + startApprove).replace("{deptId}", mgtGroupId);
+        Map<String, String> header = new HashMap<>();
+        header.put("X-CORAL-TENANT", tenantId);
+        header.put("Authorization", authorization);
+        JSONObject object = new JSONObject();
+        object.put("subject", "startPosName");
+        object.put("startPos", formCode);
+        object.put("startPosName", formName);
+        object.put("templateId", vo.getTemplateId());
+        object.put("targetType", vo.getTargetType());
+        object.put("targetId", vo.getTargetId());
+        object.put("taskType", "APPROVAL");
+        object.put("hiddenResubmit", true);
+        object.put("startorId", member.getUserId());
+        object.put("resubmitTaskId", vo.getTaskId());
+        String uuid = UUID.randomUUID().toString();
+        log.info(uuid + "重新发起审批流req========>" + object.toJSONString() + ",url========>" + url);
+        JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, object.toJSONString(), header);
+        log.info(uuid + "重新发起审批流res========>" + resObj.toJSONString());
+        return resObj.getString("id");
+    }
+
     public GLDApproveVo getApproveInfo(GLDApproveVo vo) {
         String url = host + getApproveInfo.replace("{deptId}", mgtGroupId)
                 .replace("{ids}", vo.getTaskId());

easydo-chengfa/src/main/resources/logback.xml

@@ -19,7 +19,7 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>===%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) Line:%-3L - %gray(%msg%n)</pattern>
+            <pattern>===%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) Line:%-3L - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
         <!--日志文件最大的大小-->