Browse Source

催款详情统计

anderx 1 year ago
parent
commit
5e271762b7

+ 5 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -950,6 +950,11 @@ public class PublicController extends CertifyApiController {
 		res.data(adminService.pushStatistics());
 		return res;
 	}
+
+	/**
+	 * 处理催款节点详情
+	 * @return
+	 */
 	@RequestMapping(value = "/pushDunNodeContent",method = RequestMethod.GET)
 	@ResponseBody
 	public Result pushDunNodeContent(){

+ 22 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -2512,17 +2512,34 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void pushDunNodeContent() {
 		List<TOrderNew> tOrderNews = tOrderNewMapper.selectgetAll();
 		for (TOrderNew e : tOrderNews) {
-			StringBuffer str=new StringBuffer();
 			List<OutNewOrderDunBo> dunBoList = newOrderDunMapper.selectListNewOrderDun(e.getOrderNo(), null);
+			StringBuilder valueByCode= new StringBuilder();
 			for (OutNewOrderDunBo bo : dunBoList) {
-				String valueByCode = NewOrderDunType.getValueByCode(bo.getProjectType());
-				if (bo.getDunType().equals(0)){
-					valueByCode+=bo.getCustomizeName();
+				String str =""+bo.getProjectType()+bo.getDunType();
+				valueByCode.append(NewOrderDunType.getValueByCode(Integer.valueOf(str)));
+                if (bo.getDunType().equals(0)){
+					valueByCode.append(bo.getCustomizeName());
 				}
 				if(StringUtils.isNotBlank(bo.getCustomizeTimes())){
-					valueByCode+=" "+bo.getCustomizeTimes()+")";
+					valueByCode.append(" ").append(bo.getCustomizeTimes());
+				}
+				if (bo.getAppropriationRatio()!=null){
+					valueByCode.append(" ").append(bo.getAppropriationRatio()).append("%");
+				}else {
+					valueByCode.append(" ").append(bo.getMoney());
 				}
+				if (bo.getStatus()==0){
+					valueByCode.append(" 未启动");
+				}else if (bo.getStatus()==1){
+					valueByCode.append(" 已启动");
+				}
+				valueByCode.append(",");
+			}
+			if (StringUtils.isNotBlank(valueByCode)){
+				TOrderMid mid=new TOrderMid();
+				mid.setOrderNo(e.getOrderNo());
 
+				tOrderMidMapper.updateByOrderNo(mid);
 			}
 		}
 	}