yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

维修单结算修改

master
fanzongzhe 8 months ago
parent
98855dec45
commit
fbeb730a3d
2 changed files with 72 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java
  2. 3
      yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java

71
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java
View File

@ -66,6 +66,7 @@ import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrg;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign;
import com.yxt.anrui.as.feign.sms.smssalesbill.*;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventory;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryFeign;
@ -123,6 +124,8 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
private MessageFeign messageFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
private QueryWrapper<AsBillSettelApply> createQueryWrapper(AsBillSettelApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -671,6 +674,22 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
appMap.put("sid", businessSid);
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
variables.put("app", appMap);
//判断发起人是否为前台主管
String createBySid = settelApply.getCreateBySid();
// List<String> list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
// variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
boolean discount = false; //是否低于销售价X折或低于优惠金额X元
boolean isSecond = false; //是否为自有二级站
boolean isZhan = false; //是否为自有二级站长
boolean isZG = false; //是否为前台主管
boolean price = false; //是否低于销售价X折
boolean chengben = false; //是否低于成本价
variables.put("discount", discount);
variables.put("isSecond", isSecond);
variables.put("isZhan", isZhan);
variables.put("isZG", isZG);
variables.put("price", price);
variables.put("chengben", chengben);
//流程定义id
bv.setModelId(ProcDefEnum.BILLSETTLEAPPLY.getProDefId());
bv.setFormVariables(variables);
@ -740,6 +759,18 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
boolean discount = false; //是否低于销售价X折或低于优惠金额X元
boolean isSecond = false; //是否为自有二级站
boolean isZhan = false; //是否为自有二级站长
boolean isZG = false; //是否为前台主管
boolean price = false; //是否低于销售价X折
boolean chengben = false; //是否低于成本价
variables.put("discount", discount);
variables.put("isSecond", isSecond);
variables.put("isZhan", isZhan);
variables.put("isZG", isZG);
variables.put("price", price);
variables.put("chengben", chengben);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
if (StringUtils.isBlank(settelApply.getProcDefId())) {
flowProcessMapQuery.setProDefKey(bv.getModelId());
@ -788,6 +819,20 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
ResultBean<List<SettleNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
boolean discount = false; //是否低于销售价X折或低于优惠金额X元
boolean isSecond = false; //是否为自有二级站
boolean isZhan = false; //是否为自有二级站长
boolean isZG = false; //是否为前台主管
boolean price = false; //是否低于销售价X折
boolean chengben = false; //是否低于成本价
Map<String, Object> variables = new HashMap<>();
variables.put("discount", discount);
variables.put("isSecond", isSecond);
variables.put("isZhan", isZhan);
variables.put("isZG", isZG);
variables.put("price", price);
variables.put("chengben", chengben);
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.BILLSETTLEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@ -799,6 +844,20 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
ResultBean<List<SettleNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
boolean discount = false; //是否低于销售价X折或低于优惠金额X元
boolean isSecond = false; //是否为自有二级站
boolean isZhan = false; //是否为自有二级站长
boolean isZG = false; //是否为前台主管
boolean price = false; //是否低于销售价X折
boolean chengben = false; //是否低于成本价
Map<String, Object> variables = new HashMap<>();
variables.put("discount", discount);
variables.put("isSecond", isSecond);
variables.put("isZhan", isZhan);
variables.put("isZG", isZG);
variables.put("price", price);
variables.put("chengben", chengben);
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.BILLSETTLEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@ -828,6 +887,18 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
boolean discount = false; //是否低于销售价X折或低于优惠金额X元
boolean isSecond = false; //是否为自有二级站
boolean isZhan = false; //是否为自有二级站长
boolean isZG = false; //是否为前台主管
boolean price = false; //是否低于销售价X折
boolean chengben = false; //是否低于成本价
variables.put("discount", discount);
variables.put("isSecond", isSecond);
variables.put("isZhan", isZhan);
variables.put("isZG", isZG);
variables.put("price", price);
variables.put("chengben", chengben);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {

3
yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
View File

@ -16,7 +16,7 @@ public enum ProcDefEnum {
ASBWDIFFAPPLY("工单应收调差申请", "process_b1thoh6n:2:14197532"),
ASBWINVOICEAPPLY("工单开票申请", "process_ldw1bs5t:1:14197536"),
ASTECHTITLEAPPLY("维修技师职称备案申请", "process_kl8rqdjf:1:14197604"),
BILLSETTLEAPPLY("工单结算申请", "process_q2p7s99n:1:14197580"),
BILLSETTLEAPPLY("工单结算申请", "process_q2p7s99n:2:14900004"),
ASHOSESUPPAPPLY("工时提成抵顶配件费用申请", "process_z2d1n43e:1:14197592"),
ASSERVICEITEMAPPLY("维修项目备案申请", "process_mbiz75zg:1:14197572"),
ASSERVICEACCOMMAPPLY("配件销售提成备案申请", "process_89i56wrn:1:14197576"),
@ -26,7 +26,6 @@ public enum ProcDefEnum {
ProcDefEnum(String proDefName, String proDefId) {
this.proDefName = proDefName;
this.proDefId = proDefId;
}
/**

Write Preview
Loading…
Cancel
Save