approve

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

@@ -83,7 +83,6 @@ public class PurchaseAnswerSignController {
             purchase = jdbcClient.getJdbcModelById(purchase, connection);
 
             GLDApproveVo vo = new GLDApproveVo();
-            vo.setTargetId(0);
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_ANSWER_SIGN.getValue());
             vo.setTemplateId(model.getTemplateId());
             String taskId = gldApproveService.startApprove(vo);
@@ -112,6 +111,48 @@ public class PurchaseAnswerSignController {
         }
     }
 
+    @WebLog
+    @RequestMapping(value = "/resubmit")
+    public Object resubmit(@RequestBody PurchaseAnswerSign model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            Purchase purchase = new Purchase();
+            purchase.setId(model.getPurchaseId());
+            purchase = jdbcClient.getJdbcModelById(purchase, connection);
+
+            GLDApproveVo vo = new GLDApproveVo();
+            vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_ANSWER_SIGN.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());
+
+            purchase.setStep(ChengfaEnum.PURCHASE_STEP_PURCHASE_ANSWER_SIGN.getValue());
+            purchase.setStatus(ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue());
+            jdbcClient.jdbcUpdateById(purchase, connection);
+
+            model.setStatus(ChengfaEnum.PURCHASE_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 = "/getById")
     public Object getById(@RequestBody PurchaseAnswerSign model) throws Exception {

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

@@ -117,7 +117,6 @@ public class PurchaseApplyController {
             }
 
             GLDApproveVo vo = new GLDApproveVo();
-            vo.setTargetId(0);
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE.getValue());
             vo.setTemplateId(model.getTemplateId());
             String taskId = gldApproveService.startApprove(vo);
@@ -143,6 +142,41 @@ public class PurchaseApplyController {
         }
     }
 
+    @WebLog
+    @RequestMapping(value = "/resubmit")
+    public Object resubmit(@RequestBody Purchase model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            GLDApproveVo vo = new GLDApproveVo();
+            vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE.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.setStep(ChengfaEnum.PURCHASE_STEP_PURCHASE_APPLY.getValue());
+            model.setStatus(ChengfaEnum.PURCHASE_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 Purchase model) throws Exception {

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

@@ -93,7 +93,6 @@ public class PurchaseBidNoticeController {
             purchase = jdbcClient.getJdbcModelById(purchase, connection);
 
             GLDApproveVo vo = new GLDApproveVo();
-            vo.setTargetId(0);
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_NOTICE.getValue());
             vo.setTemplateId(model.getTemplateId());
             String taskId = gldApproveService.startApprove(vo);
@@ -122,6 +121,48 @@ public class PurchaseBidNoticeController {
         }
     }
 
+    @WebLog
+    @RequestMapping(value = "/resubmit")
+    public Object resubmit(@RequestBody PurchaseBidNotice model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            Purchase purchase = new Purchase();
+            purchase.setId(model.getPurchaseId());
+            purchase = jdbcClient.getJdbcModelById(purchase, connection);
+
+            GLDApproveVo vo = new GLDApproveVo();
+            vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_NOTICE.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());
+
+            purchase.setStep(ChengfaEnum.PURCHASE_STEP_PURCHASE_BID_NOTICE.getValue());
+            purchase.setStatus(ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue());
+            jdbcClient.jdbcUpdateById(purchase, connection);
+
+            model.setStatus(ChengfaEnum.PURCHASE_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 = "/getById")
     public Object getById(@RequestBody PurchaseBidNotice model) throws Exception {

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

@@ -82,7 +82,6 @@ public class PurchaseBidSignController {
             purchase = jdbcClient.getJdbcModelById(purchase, connection);
 
             GLDApproveVo vo = new GLDApproveVo();
-            vo.setTargetId(0);
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_SIGN.getValue());
             vo.setTemplateId(model.getTemplateId());
             String taskId = gldApproveService.startApprove(vo);
@@ -111,6 +110,48 @@ public class PurchaseBidSignController {
         }
     }
 
+    @WebLog
+    @RequestMapping(value = "/resubmit")
+    public Object resubmit(@RequestBody PurchaseBidSign model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            Purchase purchase = new Purchase();
+            purchase.setId(model.getPurchaseId());
+            purchase = jdbcClient.getJdbcModelById(purchase, connection);
+
+            GLDApproveVo vo = new GLDApproveVo();
+            vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_SIGN.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());
+
+            purchase.setStep(ChengfaEnum.PURCHASE_STEP_PURCHASE_BID_SIGN.getValue());
+            purchase.setStatus(ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue());
+            jdbcClient.jdbcUpdateById(purchase, connection);
+
+            model.setStatus(ChengfaEnum.PURCHASE_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 = "/getById")
     public Object getById(@RequestBody PurchaseBidSign model) throws Exception {

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

@@ -88,7 +88,6 @@ public class PurchaseMatterController {
             purchase = jdbcClient.getJdbcModelById(purchase, connection);
 
             GLDApproveVo vo = new GLDApproveVo();
-            vo.setTargetId(0);
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_MATTER.getValue());
             vo.setTemplateId(model.getTemplateId());
             String taskId = gldApproveService.startApprove(vo);
@@ -117,6 +116,49 @@ public class PurchaseMatterController {
         }
     }
 
+    @WebLog
+    @RequestMapping(value = "/resubmit")
+    public Object resubmit(@RequestBody PurchaseMatter model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            Purchase purchase = new Purchase();
+            purchase.setId(model.getPurchaseId());
+            purchase = jdbcClient.getJdbcModelById(purchase, connection);
+
+            GLDApproveVo vo = new GLDApproveVo();
+            vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_MATTER.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());
+
+            purchase.setStep(ChengfaEnum.PURCHASE_STEP_PURCHASE_MATTER.getValue());
+            purchase.setStatus(ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue());
+            jdbcClient.jdbcUpdateById(purchase, connection);
+
+            model.setStatus(ChengfaEnum.PURCHASE_STATUS_APPROVE.getValue());
+            jdbcClient.jdbcUpdateById(model, connection);
+
+            connection.commit();
+            return new ResponseEntity<>(model, HttpStatus.OK);
+        } catch (Exception e) {
+            connection.rollback();
+            throw new BizException(e.getMessage());
+        } finally {
+            jdbcClient.finallyExecute(connection);
+        }
+    }
+
+
     @WebLog
     @RequestMapping(value = "/getById")
     public Object getById(@RequestBody PurchaseMatter model) throws Exception {