出库申请问题修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java

@@ -54,7 +54,7 @@ public class AppDeliveredApplyInfoVo implements Vo {
     private String createBySid;
 
     @ApiModelProperty("流程实列id")
-    private String procInsId;
+    private String procInstId;
 
     @ApiModelProperty("任务id")
     private String taskId;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ public class AppSubmitDeliveredApplyDto extends AppDeliveredApplyDto {
     @ApiModelProperty("意见")
     private String comment;
     @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
     private String instanceId;
     @ApiModelProperty("任务id")
     private String taskId;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -47,8 +47,6 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
-import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
-import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -65,14 +63,14 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -114,6 +112,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     CommonContractFeign commonContractFeign;
     @Autowired
     BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private MessageFeign messageFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -750,12 +750,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 String vin = carList.get(0).getVin();
                 baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, stringResultBean.getData()).getData();
                 busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
+                //更改车辆状态
+                for (int i = 0; i < carList.size(); i++) {
+                    String vinNo = carList.get(i).getVin();
+                    busDeliveredService.updateState(vinNo, 0);
+                }
             }
+            baseMapper.updateStateBySid(2, dtoSid, DateUtil.date());
             busDeliveredApply.setApplySid(sysUserVo.getSid());
             busDeliveredApply.setApplyName(sysUserVo.getName());
             busDeliveredApply.setModelSid(baseVehicle.getModelSid());
             busDeliveredApply.setConfigSid(baseVehicle.getModelConfigSid());
             save(busDeliveredApply);
+            return rb.success().setData(busDeliveredApply.getSid());
         } else {
             BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);
             if (busDeliveredApply == null) {
@@ -776,8 +783,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
             }
             updateById(busDeliveredApply);
+            return rb.success().setData(busDeliveredApply.getSid());
         }
-        return rb.success().setData(dtoSid);
     }
 
     public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
@@ -869,9 +876,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
-        Map<String, Object> variables = BeanUtil.beanToMap(dto);
-        //若有网关，则赋值网关中判断的字段。
-        variables.put("businessSid", businessSid);
+        Map<String, Object> variables = new HashMap<>();
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -879,12 +884,29 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //用户sid
         bv.setUserSid(dto.getUserSid());
         bv.setFormVariables(variables);
+        //若app移动端有此功能，则传递appMap参数
+        Map<String, Object> appMap = new HashMap<>();
+        //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //极光推送
+            busDeliveredApply = fetchBySid(businessSid);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("出库申请");
+            messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("出库申请");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return voResultBean;
         }
         if (r == 2) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -44,6 +44,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -128,30 +129,30 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("提交流程")
     @PostMapping("/submitRetrievalInfo")
     @ResponseBody
-    ResultBean submitRetrievalInfo(@RequestBody SubmitRetrievalDto dto);
+    ResultBean submitRetrievalInfo(@Valid @RequestBody SubmitRetrievalDto dto);
 
     @ApiOperation("办理")
-    @PutMapping("/agreeAdvanceInvoiceInfo")
+    @PutMapping("/agreeRetrievalInfo")
     @ResponseBody
-    ResultBean agreeRetrievalInfo(@RequestBody CompleteRetrievalDto dto);
+    ResultBean agreeRetrievalInfo(@Valid @RequestBody CompleteRetrievalDto dto);
 
     @ApiOperation("驳回")
     @PutMapping("/rejectRetrievalInfo")
     @ResponseBody
-    ResultBean rejectRetrievalInfo(@RequestBody RetrievalTaskQuery query);
+    ResultBean rejectRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query);
 
     @ApiOperation("撤回")
     @PutMapping("/recallRetrievalInfo")
     @ResponseBody
-    ResultBean recallRetrievalInfo(@RequestBody RetrievalTaskQuery query);
+    ResultBean recallRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query);
 
     @ApiOperation("终止")
     @PutMapping("/stopRetrievalInfo")
     @ResponseBody
-    ResultBean stopRetrievalInfo(@RequestBody RetrievalTaskQuery query);
+    ResultBean stopRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query);
 
     @ApiOperation("获取流程操作标题")
     @GetMapping("/getFlowOperateTitle")
     @ResponseBody
-    ResultBean<String> getFlowOperateTitle(@SpringQueryMap RetrievalQuery query);
+    ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java

@@ -51,7 +51,8 @@ public class DeliveredApplyDetailsVo implements Vo {
     private String userSid;
 
     @ApiModelProperty("流程实列id")
-    private String procInsId;
+    @JsonProperty("procInsId")
+    private String procInstId;
 
     @ApiModelProperty("任务id")
     private String taskId;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java

@@ -11,23 +11,10 @@ import javax.validation.constraints.NotBlank;
 public class SubmitRetrievalDto extends DeliveredApplyDto {
     private static final long serialVersionUID = -471108222247151552L;
 
-    @ApiModelProperty(value = "任务id")
-    @NotBlank(message = "参数错误：taskId")
-    private String taskId;
-    @ApiModelProperty(value = "流程id")
-    @NotBlank(message = "参数错误：procInsId")
+    @ApiModelProperty("流程实例id")
     @JsonProperty("procInsId")
     private String instanceId;
-    @ApiModelProperty(value = "意见")
-    private String comment;
-    @ApiModelProperty(value = "业务sid")
-    @NotBlank(message = "参数错误：businessSid")
-    private String businessSid;
-    @ApiModelProperty(value = "用户sid")
-    @NotBlank(message = "参数错误：userSid")
-    private String userSid;
-    @ApiModelProperty(value = "节点id")
-    @NotBlank(message = "参数错误：taskDefKey")
-    private String taskDefKey;
+    @ApiModelProperty("任务id")
+    private String taskId;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java

@@ -8,6 +8,8 @@ import lombok.Data;
 public class AppManufacturerVo implements Vo {
     private static final long serialVersionUID = 6743866407572366715L;
 
+    @ApiModelProperty("本分公司开户账号sid")
+    private String accountSid;
     @ApiModelProperty("银行账号")
     private String bankAccount;
     @ApiModelProperty("账户名称")