Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/SalesConfiguration.java

@@ -79,7 +79,7 @@ public class SalesConfiguration {
 	
 	
 	/***********需用计划******************/
-	
+	@Bean
 	public NeedPlanController needPlanController() {
 		return new NeedPlanController();
 	}

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/NeedPlanDao.java

 package com.xyst.dinas.sales.dao;
 
+import java.util.List;
 import java.util.UUID;
 
 import com.beecode.bcp.type.KObject;
@@ -8,4 +9,6 @@ public interface NeedPlanDao {
 
 	KObject queryNeedPlanByContractIdAndCycleId(UUID planningCycleId, UUID contractId);
 
+	List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId);
+
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/NeedPlanDaoImpl.java

 package com.xyst.dinas.sales.internal.dao;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
+import javax.persistence.Tuple;
+
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
@@ -10,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateCallback;
 import org.springframework.orm.hibernate5.HibernateOperations;
 
+import com.beecode.amino.common.Convert;
 import com.beecode.bcp.type.KObject;
 import com.xyst.dinas.sales.constant.NeedPlanConstant;
 import com.xyst.dinas.sales.dao.NeedPlanDao;
@@ -35,6 +41,25 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
 			}
 		});
 	}
+
+	@Override
+	public List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId) {
+		List<UUID> list = new ArrayList<>();
+		String sql = " SELECT DISTINCT contract FROM xyst_dinas_sales_need_plan WHERE HEX(planning_cycle) =:planningCycleId ";
+		return template.execute(new HibernateCallback<List<UUID>>() {
+			@Override
+			public List<UUID> doInHibernate(Session session) throws HibernateException {
+				Query<Tuple> query = session.createNativeQuery(sql, Tuple.class);
+				query.setParameter("planningCycleId", planningCycleId.toString().replaceAll("-", ""));
+				List<Tuple> result = query.getResultList();
+				for (Tuple tuple : result) {
+					HashMap<String, Object> map = new HashMap<>();
+					list.add(Convert.toUUID(tuple.get(0)));
+				}
+				return list;
+			}
+		});
+	}
 	
 	
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/NeedPlanServiceImpl.java

 package com.xyst.dinas.sales.internal.service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,4 +33,10 @@ public class NeedPlanServiceImpl implements NeedPlanService {
 		return kObject;
 	}
 
+	@Override
+	public List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId) {
+		List<UUID> list = needPlanDao.queryNeedPlanContratByCycleId(planningCycleId);
+		return list;
+	}
+
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/NeedPlanService.java

 package com.xyst.dinas.sales.service;
 
+import java.util.List;
 import java.util.UUID;
 
 import com.beecode.bcp.type.KObject;
@@ -9,4 +10,6 @@ public interface NeedPlanService {
 
 	KObject queryNeedPlanAmountByDinasType(UUID planningCycleId, UUID contractId, UUID DinasTypeId);
 
+	List<UUID> queryNeedPlanContratByCycleId(UUID fromString);
+
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/NeedPlanController.java

 package com.xyst.dinas.sales.web;
 
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -23,12 +24,19 @@ public class NeedPlanController {
 	
 	@ResponseBody
     @RequestMapping(value = "/needplan/queryNeedPlanAmountByDinasType", method = RequestMethod.GET)
-    public Object verifyName(@RequestParam("planningCycleId") String planningCycleId,
+    public Object queryNeedPlanAmountByDinasType(@RequestParam("planningCycleId") String planningCycleId,
     		@RequestParam("contractId") String contractId,
     		@RequestParam("dinasTypeId") String dinasTypeId) {
 
 		KObject kobject = needPlanService.queryNeedPlanAmountByDinasType(UUID.fromString(planningCycleId), UUID.fromString(contractId), UUID.fromString(dinasTypeId));
 		return ResponseObj.success("success", kobject);
     }
+	
+	@ResponseBody
+    @RequestMapping(value = "/sand/user/needplan/queryNeedPlanContratByCycleId", method = RequestMethod.GET)
+    public Object queryNeedPlanContratByCycleId(@RequestParam("planningCycleId") String planningCycleId) {
+		List<UUID> list = needPlanService.queryNeedPlanContratByCycleId(UUID.fromString(planningCycleId));
+		return ResponseObj.success("success", list);
+    }
 
 }