服务指令-生成工单,增加实际执行人,服务容错时长字段

This commit is contained in:
曹磊 2026-01-12 10:17:26 +08:00
parent 01a7a375d6
commit 9a3dd19173
1 changed files with 32 additions and 0 deletions

View File

@ -12,6 +12,7 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
import com.nu.modules.sysconfig.ISysConfigApi;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
@ -42,9 +43,29 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
@Autowired
ISendOrderRuleSubService sendOrderRuleSubService;
@Autowired
private ISysConfigApi sysConfigApi;
@Autowired
private ISysBaseAPI sysBaseAPI;
SendOrderRule sendOrderRule;
List<SendOrderRuleSub> ruleSubList;
private String allowedTimeout;
/**
* 获取容错时长
*
* @return
*/
private void getAllowedTimeout() {
if (allowedTimeout == null || allowedTimeout.equals("")) {
JSONObject json = sysConfigApi.getByKey("fwzl_rcsc");
if (json != null) {
allowedTimeout = json.getString("configValue");
}
}
if(allowedTimeout == null || allowedTimeout.equals("")){
allowedTimeout = "0";
}
}
/**
* 获取派单规则
@ -102,6 +123,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
public Result<?> generateOrdersBatch(){
//获取派单规则
getSendOrderRule();
getAllowedTimeout();
List<DirectiveOrder> ordersList = baseMapper.queryDataPoolList(null);
for(int i=0;i<ordersList.size();i++){
DirectiveOrder orders = ordersList.get(i);
@ -130,6 +152,10 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
orders.setIzStart("N");
orders.setIzFinish("N");
orders.setOrderType("1");
orders.setOptType("1");
orders.setOptIds(employee.getEmployeeId());
orders.setOptNames(employee.getEmployeeName());
orders.setServiceAllowedTimeout(allowedTimeout);
this.save(orders);//生成工单主表
for(int i=0;i<ordersSubList.size();i++){
DirectiveOrderSub ordersSub = ordersSubList.get(i);
@ -160,6 +186,11 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
orders.setEmployeeName(employee.getEmployeeName());
orders.setIzStart("N");
orders.setIzFinish("N");
orders.setOrderType("1");
orders.setOptType("1");
orders.setOptIds(employee.getEmployeeId());
orders.setOptNames(employee.getEmployeeName());
orders.setServiceAllowedTimeout(allowedTimeout);
this.save(orders);//生成工单主表
for(int i=0;i<ordersSubList.size();i++){
DirectiveOrderSub ordersSub = ordersSubList.get(i);
@ -169,6 +200,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
ordersSub.setEmployeeName(employee.getEmployeeName());
ordersSub.setIzStart("N");
ordersSub.setIzFinish("N");
ordersSub.setOrderType("1");
ordersSubService.save(ordersSub);//生成工单子表
}
baseMapper.updatePoolIzOrder(orders.getPoolId());