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

pc未售买断完善调式

master
dimengzhe 3 years ago
parent
ab89cf0250
commit
e7839ba7ee
4 changed files with 30 additions and 9 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. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.java
  3. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml
  4. 33
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsService.java
View File

@ -30,7 +30,7 @@ public class BaseVehicleActualDetailsService extends MybatisBaseService<BaseVehi
BaseVehicleActualDetails baseVehicleActualDetails = null;
for (BaseVehicleActualDetailsDto dto : detailsList) {
baseVehicleActualDetails = new BaseVehicleActualDetails();
BeanUtils.copyProperties(dto, baseVehicleActualDetails, baseVehicleActualDetails.getSid());
BeanUtils.copyProperties(dto, baseVehicleActualDetails, "sid");
baseVehicleActualDetails.setVehicleActualSid(saleSid);
save(baseVehicleActualDetails);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.java
View File

@ -44,5 +44,5 @@ public interface BaseVehicleActualSalesMapper extends BaseMapper<BaseVehicleActu
* @param taskDefKey 任务定义的ID值
*/
void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String proDefId, @Param("nodeState") String nodeState,
@Param("procInstSid") String procInsId, @Param("nodeSid") String taskDefKey);
@Param("procInstSid") String procInsId, @Param("nodeSid") String taskDefKey,@Param("taskId") String taskId);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml
View File

@ -6,7 +6,7 @@
sv.applicationName,
DATE_FORMAT(sv.createTime, '%Y-%m-%d') as createTime,
sv.reason,
(select count(*) from scm_vehicle_actual_details sa where sa.vehicleActualSid = sv.sid) as num
(select count(*) from base_vehicle_actual_details sa where sa.vehicleActualSid = sv.sid) as num
from base_vehicle_actual_sales sv
${ew.customSqlSegment}
</select>

33
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
View File

@ -18,7 +18,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -75,7 +74,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
PagerVo<BaseVehicleActualSalesVo> pv1 = PagerUtil.pageToVo(page, pv);
List<BaseVehicleActualSalesVo> voList = pv1.getRecords();
if (voList.size() > 0) {
for (int i = 0; i < voList.size(); i++) {
/* for (int i = 0; i < voList.size(); i++) {
ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(voList.get(i).getSid());
if (resultBean.getSuccess() && resultBean.getData() != null) {
SysFormStateVo formState = resultBean.getData();
@ -84,6 +83,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
} else {
voList.get(i).setFlowState(0);
}
}*/
for (BaseVehicleActualSalesVo vo : voList) {
if (StringUtils.isNotBlank(vo.getNodeState())) {
vo.setNodeState(vo.getNodeState());
} else {
vo.setNodeState("待提交");
}
}
}
return pv1;
@ -130,7 +136,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
if (StringUtils.isBlank(sid)) {
//新增
BaseVehicleActualSales baseVehicleActualSales = new BaseVehicleActualSales();
BeanUtils.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, baseVehicleActualSales.getSid());
BeanUtils.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "sid");
boolean isSave = save(baseVehicleActualSales);
if (!isSave) {
return rb.setMsg("保存失败");
@ -235,12 +241,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
if (businessResultBean.getSuccess() && businessResultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) businessResultBean.getData();
//更新未售买断业务表中的流程状态
modifyFlowState(businessSid,
/* modifyFlowState(businessSid,
ProcDefEnum.SCMVEHICLERETURN.getProDefId(),
map.get("nodeState"),
map.get("procInsId"),
map.get("taskDefKey")
);
);*/
modifyFlowState(businessSid,
ProcDefEnum.SALESORDER.getProDefId(),
map.get("nodeState"),
map.get("procInsId"),
map.get("taskDefKey"),
map.get("taskId"));
return rb.success();
} else {
return rb.setMsg(businessResultBean.getMsg());
@ -256,7 +268,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
* @param procInsId 流程实例ID
* @param taskDefKey 任务定义的ID值
*/
private void modifyFlowState(String businessSid, String proDefId, String nodeState,
/*private void modifyFlowState(String businessSid, String proDefId, String nodeState,
String procInsId,
String taskDefKey) {
baseMapper.modifyFlowState(businessSid,
@ -264,6 +276,15 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
nodeState,
procInsId,
taskDefKey);
}*/
private void modifyFlowState(String businessSid, String proDefId, String nodeState,
String procInsId,
String taskDefKey, String taskId) {
baseMapper.modifyFlowState(businessSid,
proDefId,
nodeState,
procInsId,
taskDefKey, taskId);
}
/**

Write Preview
Loading…
Cancel
Save