Просмотр исходного кода

财务订单特批相关修改

anderx 1 год назад
Родитель
Сommit
2a253da5cf

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -51,7 +51,7 @@ public interface TOrderNewMapper {
 
 
     int updateFinance(@Param("aid")String aid, @Param("orderNos") List<String> orderNos, @Param("newFinance")String newFinance);
     int updateFinance(@Param("aid")String aid, @Param("orderNos") List<String> orderNos, @Param("newFinance")String newFinance);
     int checkContractNo(String sno);
     int checkContractNo(String sno);
-    Map<String, Object> countTotalAndActually(@Param("o") OrderListBo o, @Param("fids") List<String> fids, @Param("deps")List<String> listDep);
+    Map<String, Object> countTotalAndActually(@Param("o") OrderListBo o, @Param("fids") List<String> fids, @Param("deps")List<String> listDep,@Param("types")List<String> types);
     TOrderBillNew getLastPayment(String orderNo);
     TOrderBillNew getLastPayment(String orderNo);
     int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
     int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
     List<TOrderNewBo> selectUsedOrderByOrder(String orderNo);
     List<TOrderNewBo> selectUsedOrderByOrder(String orderNo);

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1321,12 +1321,12 @@
         select IFNULL( sum(o.settlement_amount),0) actuallyTotalAmount,IFNULL(sum(o.total_amount),0)  signTotalAmount
         select IFNULL( sum(o.settlement_amount),0) actuallyTotalAmount,IFNULL(sum(o.total_amount),0)  signTotalAmount
         from t_order_new o
         from t_order_new o
         left join department d   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id  left join t_order_mid a on o.order_no=a.order_no
         left join department d   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id  left join t_order_mid a on o.order_no=a.order_no
-        <if test="o.type !=null">
+        <if test="types !=null">
             inner join
             inner join
             (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
             (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
             from t_order_approval
             from t_order_approval
             where `type` in
             where `type` in
-            <foreach collection="o.type" item="item" separator="," open="(" close=")">
+            <foreach collection="types" item="item" separator="," open="(" close=")">
                 #{item}
                 #{item}
             </foreach>
             </foreach>
         group by order_no) toa on o.order_no=toa.order_no
         group by order_no) toa on o.order_no=toa.order_no

+ 14 - 0
src/main/java/com/goafanti/order/bo/inuptTaskListBo.java

@@ -17,9 +17,23 @@ public class inuptTaskListBo {
 	private String startTime;
 	private String startTime;
 	private String endTime;
 	private String endTime;
 	private String cid;
 	private String cid;
+
+	/**
+	 * 特批类型
+	 */
+	private String type;
+
 	private Integer pageNo;
 	private Integer pageNo;
 	private Integer pageSize;
 	private Integer pageSize;
 
 
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
 	public String getProjectName() {
 	public String getProjectName() {
 		return projectName;
 		return projectName;
 	}
 	}

+ 4 - 4
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -103,10 +103,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	@RequestMapping(value="/managerSelect" ,method = RequestMethod.GET)
 	@RequestMapping(value="/managerSelect" ,method = RequestMethod.GET)
 	public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 	public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
-			String endTime,Integer pageNo,Integer pageSize){
+			String endTime,String type,Integer pageNo,Integer pageSize){
 		Result res=new Result();
 		Result res=new Result();
 		res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,thchId,
 		res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,thchId,
-				 depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime , pageNo, pageSize));
+				 depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime,type , pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
 
 
@@ -117,10 +117,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	@RequestMapping(value="/exportManagerSelect" ,method = RequestMethod.GET)
 	@RequestMapping(value="/exportManagerSelect" ,method = RequestMethod.GET)
 	public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 	public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
-			String endTime,Integer pageNo,Integer pageSize){
+			String endTime,String type,Integer pageNo,Integer pageSize){
 		@SuppressWarnings("unchecked")
 		@SuppressWarnings("unchecked")
 		List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
 		List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
-				cid, projectType,thchId,depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
+				cid, projectType,thchId,depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime ,type, pageNo, pageSize).getList();
 		NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
 		NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
 		return excel.exportExcel(list, "企业项目查询列表", uploadPath);
 		return excel.exportExcel(list, "企业项目查询列表", uploadPath);
 	}
 	}

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -63,7 +63,7 @@ public interface OrderProjectService {
 	int updateTaskProgress(TaskProgressBo t);
 	int updateTaskProgress(TaskProgressBo t);
 
 
 	Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid, String projectType,String thchId, String depId,
 	Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid, String projectType,String thchId, String depId,
-			String techDepId, Integer declarationBatch, String commodityPrice, String startTime, String endTime, Integer pageNo, Integer pageSize);
+			String techDepId, Integer declarationBatch, String commodityPrice, String startTime, String endTime, String type,Integer pageNo, Integer pageSize);
 
 
 	int updateProjectStatus(UpdateProjectStatusBo b);
 	int updateProjectStatus(UpdateProjectStatusBo b);
 
 

+ 6 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -148,6 +148,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		}
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包
 		params.put("o", order);
 		params.put("o", order);
+		List<String> types=null;
+		if (order.getType()!=null){
+			types=Arrays.asList(order.getType().split(","));
+			params.put("type", types);
+		}
 		List<String> listDep=null;
 		List<String> listDep=null;
 		if (order.getDeps()!=null){
 		if (order.getDeps()!=null){
 			params.put("deps", departmentService.parseArray(order.getDeps()));
 			params.put("deps", departmentService.parseArray(order.getDeps()));
@@ -165,7 +170,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				else o.setMyExamine(0);
 				else o.setMyExamine(0);
 			}
 			}
 		}
 		}
-		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids,listDep);
+		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids,listDep,types);
 		result.put("count", count);
 		result.put("count", count);
 		return result;
 		return result;
 	}
 	}

+ 5 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -464,6 +464,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (null != ib.getTaskStatus()) params.put("taskStatus", ib.getTaskStatus());
 		if (null != ib.getTaskStatus()) params.put("taskStatus", ib.getTaskStatus());
 		if (ib.getOutsourceStatus() !=null) params.put("outsourceStatus", ib.getOutsourceStatus());
 		if (ib.getOutsourceStatus() !=null) params.put("outsourceStatus", ib.getOutsourceStatus());
 		if (ib.getCid() !=null) params.put("cid", ib.getCid());
 		if (ib.getCid() !=null) params.put("cid", ib.getCid());
+		if (ib.getType()!=null){
+			String[] split = ib.getType().split(",");
+			params.put("type", split);
+		}
 		List<String> fids=new ArrayList<>();
 		List<String> fids=new ArrayList<>();
 		 if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)){
 		 if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)){
 			params.put("role", 0);
 			params.put("role", 0);
@@ -1186,7 +1190,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	@Override
 	public Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid,
 	public Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid,
 			String projectType,String thchId, String depId, String techDepId, Integer declarationBatch, String commodityPrice,
 			String projectType,String thchId, String depId, String techDepId, Integer declarationBatch, String commodityPrice,
-			String startTime,String endTime ,Integer pageNo, Integer pageSize) {
+			String startTime,String endTime ,String type,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if(pageNo==null||pageNo<0)pageNo=1;