调整了审核流

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

 package com.junmp.jyzb.api.bean.req;
 
+import com.junmp.jyzb.api.bean.Validator.IsDateTime;
 import com.junmp.jyzb.api.bean.Validator.IsNumber;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
@@ -30,6 +31,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     /**
      * 单据业务类型
      */
+//    @IsDateTime(format = "yyyy-MM-dd HH:mm:ss", message = "字段必须是有效的日期或时间")
     private String  bussinessType;
     /**
      * 订单号

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -23,6 +23,7 @@ import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
+import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -116,7 +117,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         {
             StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
-            WorkProcessService.start(startProcessInstanceDTO);
+            ApiRes<Boolean> startRes=  WorkProcessService.start(startProcessInstanceDTO);
+            if (startRes.getMessage()!="ok")
+            {
+
+            }
         }
         orderDetailService.saveBatch(detailList);
        //设置总价格和总数量

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java

@@ -46,7 +46,7 @@ public class BpmnController  {
      * 修改表单
      */
     @ApiOperation("修改表单")
-    @PutMapping("updateForm")
+    @PostMapping("updateForm")
     public ApiRes<Boolean> updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
         return ApiRes.success(WorkProcessService.updateForm(process));
     }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -403,10 +403,12 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             formName= process.getFormName().toString();
             processTemplates.setFormName(process.getFormName());
         }
-        processTemplates.setFormJson(formJsonNode.toString());
-        processTemplates.setProcessJson(processJsonNode.toString());
-        String fj=process.getFormJson().toString();
-//        processTemplates.setFormJson(process.getFormJson().toString());
+        else
+        {
+            formName =processTemplates.getFormName();
+        }
+//        processTemplates.setFormJson(formJsonNode.toString());//暂时用不到，以后会用
+
         processTemplates.setProcessJson(process.getProcessJson().toString());
         processTemplates.setUpdated(new Date());
         processTemplateService.updateById(processTemplates);//更新表单明细表信息