Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@@ -122,10 +122,16 @@ export default {
         calculationStandard: '',
         sid: '',
         vinNo: '',
+        brandName: '',
+        purchaseSystemName: '',
         manufactorSettlementPrice: '',
         freight: '',
+        topAmount: '',
         estimateRebate: '',
-        remarks: ''
+        remarks: '',
+        expectTreatCost: '',
+        expectSuppCost: '',
+        expectSuppRemark: ''
       },
       rules: {
         rebateTypeValue: [{ required: true, message: '返利类型不能为空', trigger: 'change' }],
@@ -140,9 +146,15 @@ export default {
   computed: {
     estimateRebateSum() {
       let estimateRebate = '0'
+      // 计算方式为比例时，
       if (this.formobj.calculationModeKey === '001') {
-        // 计算方式为比例时，预计返利 = （车辆入库价 - 运费） * （计算标准 / 100）
+        if (this.formobj.brandName === '陕汽') {
-        estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+          // 预计返利 = （车辆入库价 - 运费 - 上装） * （计算标准 / 100）
+          estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0) - parseFloat(this.formobj.topAmount !== '' ? this.formobj.topAmount : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+        } else {
+          // 预计返利 = （车辆入库价 - 运费） * （计算标准 / 100）
+          estimateRebate = Math.round(((parseFloat(this.formobj.manufactorSettlementPrice !== '' ? this.formobj.manufactorSettlementPrice : 0) - parseFloat(this.formobj.freight !== '' ? this.formobj.freight : 0)) * (parseFloat(this.formobj.calculationStandard) / 100)) * 100) / 100
+        }
       } else if (this.formobj.calculationModeKey === '002') {
         // 计算方式为固定金额时，预计返利 = 计算标准
         estimateRebate = this.formobj.calculationStandard
@@ -243,15 +255,17 @@ export default {
         calculationModeValue: '',
         calculationStandard: '',
         sid: '',
-        createOrgSid: '',
-        createOrgName: '',
-        useOrgSid: '',
-        useOrgName: '',
         vinNo: '',
+        brandName: '',
+        purchaseSystemName: '',
         manufactorSettlementPrice: '',
         freight: '',
+        topAmount: '',
         estimateRebate: '',
-        remarks: ''
+        remarks: '',
+        expectTreatCost: '',
+        expectSuppCost: '',
+        expectSuppRemark: ''
       }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

@@ -496,7 +496,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         }
         BusinessVariables bv = businessVariablesResultBean.getData();
         OaForm oaForm = fetchBySid(dto.getBusinessSid());
-        int r = submitBusinessData(dto);
+        int r = submitBusinessData(dto, oaForm.getTaskId());
         if (r == 1) {
             //启动流程
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
@@ -534,6 +534,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
             businessVariablesDto.setTaskId(oaForm.getTaskId());
             businessVariablesDto.setTaskDefKey(oaForm.getNodeId());
             businessVariablesDto.setComment("重新提交");
+            businessVariablesDto.setRule(dto.getRule());
             return complete(businessVariablesDto);
         }
         return rb;
@@ -546,13 +547,12 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
      * @param dto
      * @return
      */
-    private synchronized int submitBusinessData(SubmitDto dto) {
+    private synchronized int submitBusinessData(SubmitDto dto, String currentTaskId) {
         int r = 0;
-        OaForm oaForm = fetchBySid(dto.getBusinessSid());
+        if (StringUtils.isBlank(currentTaskId) && StringUtils.isBlank(dto.getNextTaskId())) {
-        if (StringUtils.isBlank(oaForm.getTaskId()) && StringUtils.isBlank(dto.getNextNodeSid())) {
             //新提交
             r = 1;
-        } else if (StringUtils.isNotBlank(oaForm.getTaskId()) && oaForm.getTaskId().equals(dto.getNextNodeSid())) {
+        } else if (StringUtils.isNotBlank(currentTaskId) && currentTaskId.equals(dto.getNextTaskId())) {
             //二次提交//只有数据一致的时候才能进行下一步
             r = 2;
         }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/CompleteDto.java

@@ -33,7 +33,7 @@ public class CompleteDto implements Dto {
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
 
-    private String orgPath;
+//    private String orgPath;
 
     private Map<String, Object> formVariables = new HashMap<>();
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/SubmitDto.java

@@ -27,7 +27,7 @@ public class SubmitDto {
     @ApiModelProperty("下一处理人获取规则")
     private int rule;
     @ApiModelProperty("任务id")
-    private String nextNodeSid;
+    private String nextTaskId;
     @ApiModelProperty("若含有其他机构的sid，则传")
     private String orgSid;
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
 import com.yxt.anrui.oa.biz.oaform.OaFormDto;
+import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
 import com.yxt.anrui.oa.biz.oaform.OaFormService;
 import com.yxt.anrui.oa.biz.oaform.flowable.*;
 import com.yxt.anrui.oa.feign.file.OaFileEnum;
@@ -144,6 +145,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
             OaFormDto oaFormDto = new OaFormDto();
             BeanUtil.copyProperties(dto, oaFormDto);
             oaFormDto.setBillNo("BKSQ");
+            oaFormDto.setSid(entity.getSid());
             ResultBean<String> resultBean = oaFormService.saveOaForm(oaFormDto);
 
             if (!resultBean.getSuccess()) {
@@ -178,6 +180,24 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return vo;
     }
 
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
+        }
+        delBySids(sids);
+        return rb.success();
+    }
+
+    /**
+     * 提交
+     *
+     * @param dto
+     * @return
+     */
     public ResultBean submit(SubmitOaMendApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
@@ -197,23 +217,13 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         formVariables.put("app", appMap);
         submitDto.setFormVariables(formVariables);
         submitDto.setProcDefId(ProcDefEnum.OAMENDAPPLY.getProDefId());
-        //若申请单中选择了下一处理人，则需赋值给下一处理人字段
+        //若申请单中选择了下一处理人，则需赋值给下一处理人字段,若没有则删除
-        submitDto.setNextNodeUserSids("");
+//        submitDto.setNextNodeUserSids("");
-        submitDto.setNextNodeSid(dto.getTaskId());
+        submitDto.setNextTaskId(dto.getTaskId());
+        submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
         return oaFormService.submit(submitDto);
     }
 
-    public ResultBean delAll(String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
-        //查询该sid中是否有流程不是待提交的
-        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
-        if (count > 0) {
-            return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败");
-        }
-        delBySids(sids);
-        return rb.success();
-    }
-
     /**
      * 办理（同意）
      *
@@ -252,7 +262,12 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return oaFormService.reject(dto);
     }
 
-    public ResultBean<List<NodeVo>> getPreviousNodesForReject(NodeQuery query) {
+     /**
+     * 提交时获取下一环节
+     * @param query
+     * @return
+     */
+    public ResultBean<List<NodeVo>> getNextNodesForSubmit(NodeQuery query) {
         Map<String, Object> formVariables = query.getFormVariables();
         //添加网关
 //        formVariables.put("", "");
@@ -261,10 +276,15 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         appMap.put("sid", query.getBusinessSid());
         formVariables.put("app", appMap);
         query.setFormVariables(formVariables);
-        return oaFormService.getPreviousNodesForReject(query);
+        return oaFormService.getNextNodesForSubmit(query);
     }
 
-    public ResultBean<List<NodeVo>> getNextNodesForSubmit(NodeQuery query) {
+    /**
+     * 驳回时获取上一环节
+     * @param query
+     * @return
+     */
+    public ResultBean<List<NodeVo>> getPreviousNodesForReject(NodeQuery query) {
         Map<String, Object> formVariables = query.getFormVariables();
         //添加网关
 //        formVariables.put("", "");
@@ -273,6 +293,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         appMap.put("sid", query.getBusinessSid());
         formVariables.put("app", appMap);
         query.setFormVariables(formVariables);
-        return oaFormService.getNextNodesForSubmit(query);
+        return oaFormService.getPreviousNodesForReject(query);
     }
+
+    /**
+     * 具体申请设置网关参数的统一方法
+     */
+
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/SubmitOaMendApplyDto.java

@@ -17,10 +17,10 @@ import lombok.Data;
 public class SubmitOaMendApplyDto extends OaMendApplyDto {
 
     private static final long serialVersionUID = 8607710587497609779L;
-    @ApiModelProperty("意见")
+    /*    @ApiModelProperty("意见")
-    private String comment;
+        private String comment;
-    @ApiModelProperty("流程实例id")
+        @ApiModelProperty("流程实例id")
-    private String instanceId;
+        private String instanceId;*/
     @ApiModelProperty("任务id")
     private String taskId;
 }