Bläddra i källkod

订单项目统计开发

anderx 1 år sedan
förälder
incheckning
2804972bcb

+ 6 - 4
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -19,6 +19,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.websocket.SystemWebSocketHandler;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
 import com.goafanti.order.enums.OrderImgEnums;
+import com.goafanti.order.service.OrderNewService;
 import com.goafanti.user.service.UserService;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +92,8 @@ public class PublicController extends CertifyApiController {
 
 	@Autowired
 	private ExpenseAccountService	expenseAccountService;
+	@Autowired
+	private OrderNewService orderNewService;
 
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
@@ -947,12 +950,11 @@ public class PublicController extends CertifyApiController {
 		res.data(adminService.pushStatistics());
 		return res;
 	}
-	@RequestMapping(value = "/pushClockIn",method = RequestMethod.POST)
+	@RequestMapping(value = "/pushDunNodeContent",method = RequestMethod.GET)
 	@ResponseBody
-	public Result pushClockIn ( String clokInTime, String userId){
+	public Result pushDunNodeContent(){
 		Result res =new Result();
-		System.out.println("=====================================================》 clokInTime="+clokInTime);
-		System.out.println("=====================================================》 userId="+userId);
+		orderNewService.pushDunNodeContent();
         res.data("ok");
         return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -235,4 +235,6 @@ public interface OrderNewService {
 	List<TOrderNew> selectGetAll();
 
     Object addOperationGuaranteeAudit(String orderNo, Integer type, String reason);
+
+    void pushDunNodeContent();
 }

+ 20 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -875,7 +875,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
-	/**
+
+
+    /**
 	 * 处理订单公出&报销最大公出
 	 */
 	private BigDecimal pushMaxDuration(BigDecimal totalAmount) {
@@ -2506,6 +2508,23 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return names;
 	}
 
+	@Override
+	public void pushDunNodeContent() {
+		List<TOrderNew> tOrderNews = tOrderNewMapper.selectgetAll();
+		for (TOrderNew e : tOrderNews) {
+			StringBuffer str=new StringBuffer();
+			List<OutNewOrderDunBo> dunBoList = newOrderDunMapper.selectListNewOrderDun(e.getOrderNo(), null);
+			for (OutNewOrderDunBo bo : dunBoList) {
+				String valueByCode = NewOrderDunType.getValueByCode(bo.getProjectType());
+				if (bo.getDunType().equals(0)){
+					valueByCode+=bo.getCustomizeName();
+				}
+				if(StringUtils.isNotBlank(bo.getCustomizeTimes())){
+					valueByCode+=" "+bo.getCustomizeTimes()+")";
+				}
 
+			}
+		}
+	}
 
 }

+ 1 - 16
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1711,22 +1711,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 						}
 					}
-				} else if (out.getPublicType()==1) {
-					//他人公出审核
-					if (!ps.isEmpty()){
-						for (PublicExamine p : ps) {
-								if (p.getAid().equals(aid)){
-									flag=false;
-									if (out.getPublicType()==1&&out.getStatus()==1){
-										if (p.getStatus()==0)out.setMyExamine(1);
-										else out.setMyExamine(0);
-										break;
-									}
-								}
-
-							}
-						}
-					}
+				}
 				} else if ((out.getTechStartProcess()==1&&out.getTechStartProcess()==2)&&out.getStatus()==1) {
 					List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(out.getId());
 					boolean myExamine = false;