接口调整

gavel/src/main/java/com/gavel/kwell/controller/KmesBoardController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gavel.common.base.controller.BaseController;
 import com.gavel.kwell.service.KmesBoardService;
 import com.gavel.kwell.vo.GpfkHgVO;
-import com.gavel.kwell.vo.PsclVO;
+import com.gavel.kwell.vo.PcslVO;
 import com.gavel.kwell.vo.SdclVO;
 import com.gavel.kwell.vo.UWoVO;
 import com.gavel.wo.persistent.Pcjhmx;
@@ -68,8 +68,8 @@ public class KmesBoardController extends BaseController {
     @RequestMapping(value = "queryWeekPcsl", method = RequestMethod.POST)
     @ResponseBody
     public Object queryPcsl(@RequestBody JSONObject param) {
-        List<Pcjhmx> pcjhmxList = kmesBoardService.queryWeekPcsl();
-        return buildReturnData(pcjhmxList);
+        List<PcslVO> pcslVOList = kmesBoardService.queryWeekPcsl();
+        return buildReturnData(pcslVOList);
     }
 
     /**
@@ -78,7 +78,7 @@ public class KmesBoardController extends BaseController {
     @RequestMapping(value = "queryTodayPcsl", method = RequestMethod.POST)
     @ResponseBody
     public Object queryTodayPcsl(@RequestBody JSONObject param) {
-        PsclVO psclVO = kmesBoardService.queryTodayPcsl();
+        PcslVO psclVO = kmesBoardService.queryTodayPcsl();
         return buildReturnData(psclVO);
     }
 
@@ -88,7 +88,7 @@ public class KmesBoardController extends BaseController {
     @RequestMapping(value = "queryMonthPcsl", method = RequestMethod.POST)
     @ResponseBody
     public Object queryMonthPcsl(@RequestBody JSONObject param) {
-        PsclVO psclVO = kmesBoardService.queryMonthPcsl();
+        PcslVO psclVO = kmesBoardService.queryMonthPcsl();
         return buildReturnData(psclVO);
     }
 

gavel/src/main/java/com/gavel/kwell/dao/KmesBoardDao.java

 package com.gavel.kwell.dao;
 
 import com.gavel.common.base.dao.BaseDao;
-import com.gavel.kwell.persistent.Wlsn;
-import com.gavel.kwell.vo.PsclVO;
+import com.gavel.kwell.vo.PcslVO;
 import com.gavel.kwell.vo.UWoVO;
-import com.gavel.kwell.vo.WlsnCondition;
-import com.gavel.kwell.vo.WlsnVO;
-import com.gavel.persistence.sql.RecordSet;
 import com.gavel.wo.persistent.Pcjhmx;
 
+import java.util.Date;
 import java.util.List;
 
 
 public interface KmesBoardDao extends BaseDao {
 
-   public List<Pcjhmx> queryWeekPcsl();
+   public Pcjhmx queryWeekPcsl(Date date);
 
-   public PsclVO queryTodayPcsl();
+   public PcslVO queryTodayPcsl();
 
-   public PsclVO queryMonthPcsl();
+   public PcslVO queryMonthPcsl();
 
    public List<UWoVO> queryWo();
 

gavel/src/main/java/com/gavel/kwell/dao/impl/KmesBoardDaoImpl.java

@@ -4,12 +4,13 @@ import com.gavel.bom.utils.GxlxGxbzEnum;
 import com.gavel.common.base.dao.impl.BaseDaoImpl;
 import com.gavel.common.utils.DateUtils;
 import com.gavel.kwell.dao.KmesBoardDao;
-import com.gavel.kwell.vo.PsclVO;
+import com.gavel.kwell.vo.PcslVO;
 import com.gavel.kwell.vo.UWoVO;
 import com.gavel.persistence.sql.SqlMap;
 import com.gavel.wo.persistent.Pcjhmx;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -18,37 +19,36 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
 
 
     @Override
-    public List<Pcjhmx> queryWeekPcsl() {
+    public Pcjhmx queryWeekPcsl(Date date) {
         SqlMap sqlMap = new SqlMap();
-        sqlMap.append("select PCJHMX_JHRQ,sum(PCJHMX_JHSL) as PCJHMX_JHSL,sum(PCJHMX_WGSL) as PCJHMX_WGSL ");
+        sqlMap.append("select sum(PCJHMX_JHSL) as PCJHMX_JHSL,sum(PCJHMX_WGSL) as PCJHMX_WGSL ");
         sqlMap.append("from PCJHMX ");
         sqlMap.append("where 1=1 and ( :ksrq <= PCJHMX_JHRQ and PCJHMX_JHRQ <= :jsrq ) ");
-        sqlMap.setParamValue("ksrq", DateUtils.beginOfDay(DateUtils.calcDate(DateUtils.getDateTime(), 0, 0, -7, 0, 0, 0)));
-        sqlMap.setParamValue("jsrq", DateUtils.endOfDay(DateUtils.calcDate(DateUtils.getDateTime(), 0, 0, -1, 0, 0, 0)));
-        sqlMap.append("group by PCJHMX_JHRQ ");
-        return sqlMap.query(Pcjhmx.class);
+        sqlMap.setParamValue("ksrq", DateUtils.beginOfDay(date));
+        sqlMap.setParamValue("jsrq", DateUtils.endOfDay(date));
+        return sqlMap.queryEntity(Pcjhmx.class);
     }
 
     @Override
-    public PsclVO queryTodayPcsl() {
+    public PcslVO queryTodayPcsl() {
         SqlMap sqlMap = new SqlMap();
         sqlMap.append("select sum(PCJHMX_JHSL) as JHSL,sum(PCJHMX_WGSL) as WGSL ");
         sqlMap.append("from PCJHMX ");
         sqlMap.append("where 1=1 and ( :ksrq <= PCJHMX_JHRQ and PCJHMX_JHRQ <= :jsrq ) ");
         sqlMap.setParamValue("ksrq", DateUtils.beginOfDay(DateUtils.getDateTime()));
         sqlMap.setParamValue("jsrq", DateUtils.endOfDay(DateUtils.getDateTime()));
-        return sqlMap.queryEntity(PsclVO.class);
+        return sqlMap.queryEntity(PcslVO.class);
     }
 
     @Override
-    public PsclVO queryMonthPcsl() {
+    public PcslVO queryMonthPcsl() {
         SqlMap sqlMap = new SqlMap();
         sqlMap.append("select sum(PCJHMX_JHSL) as JHSL,sum(PCJHMX_WGSL) as WGSL ");
         sqlMap.append("from PCJHMX ");
         sqlMap.append("where 1=1 and ( :ksrq <= PCJHMX_JHRQ and PCJHMX_JHRQ <= :jsrq ) ");
         sqlMap.setParamValue("ksrq", DateUtils.beginOfMonth(DateUtils.getDateTime()));
         sqlMap.setParamValue("jsrq", DateUtils.endOfMonth(DateUtils.getDateTime()));
-        return sqlMap.queryEntity(PsclVO.class);
+        return sqlMap.queryEntity(PcslVO.class);
     }
 
     @Override

gavel/src/main/java/com/gavel/kwell/service/KmesBoardService.java

@@ -2,7 +2,7 @@ package com.gavel.kwell.service;
 
 import com.gavel.common.base.service.BaseEditService;
 import com.gavel.kwell.vo.GpfkHgVO;
-import com.gavel.kwell.vo.PsclVO;
+import com.gavel.kwell.vo.PcslVO;
 import com.gavel.kwell.vo.SdclVO;
 import com.gavel.kwell.vo.UWoVO;
 import com.gavel.wo.persistent.Pcjhmx;
@@ -14,11 +14,11 @@ public interface KmesBoardService extends BaseEditService {
 
   public  SdclVO querySdcl();
 
-  public List<Pcjhmx> queryWeekPcsl();
+  public List<PcslVO> queryWeekPcsl();
 
-  public PsclVO queryTodayPcsl();
+  public PcslVO queryTodayPcsl();
 
-  public PsclVO queryMonthPcsl();
+  public PcslVO queryMonthPcsl();
 
   public List<UWoVO> queryWo();
 

gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java

@@ -9,7 +9,7 @@ import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.service.KmesBoardService;
 import com.gavel.kwell.utils.DateCalculateUtil;
 import com.gavel.kwell.vo.GpfkHgVO;
-import com.gavel.kwell.vo.PsclVO;
+import com.gavel.kwell.vo.PcslVO;
 import com.gavel.kwell.vo.SdclVO;
 import com.gavel.kwell.vo.UWoVO;
 import com.gavel.wo.persistent.Pcjhmx;
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.xml.crypto.Data;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -72,17 +71,34 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
     }
 
     @Override
-    public List<Pcjhmx> queryWeekPcsl() {
-        return  kmesBoardDao.queryWeekPcsl();
+    public List<PcslVO> queryWeekPcsl() {
+        Date beginDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-7,0,0,0);
+        Date endDate = DateUtils.calcDate(DateUtils.getDate(),0,0,-1,0,0,0);
+        List<Date> dateList = DateCalculateUtil.findDates("D", beginDate, endDate);
+        List<PcslVO> pcslVOList = new ArrayList<>();
+        for(Date date : dateList){
+            PcslVO pcslVO = new PcslVO();
+            Pcjhmx pcjhmx = kmesBoardDao.queryWeekPcsl(date);
+            pcslVO.setPcrq(date);
+            if(pcjhmx !=null){
+                pcslVO.setJhsl(pcjhmx.getJhsl());
+                pcslVO.setWgsl(pcjhmx.getWgsl());
+            }else {
+                pcslVO.setJhsl(0.0);
+                pcslVO.setWgsl(0.0);
+            }
+            pcslVOList.add(pcslVO);
+        }
+        return pcslVOList;
     }
 
     @Override
-    public PsclVO queryTodayPcsl() {
+    public PcslVO queryTodayPcsl() {
         return  kmesBoardDao.queryTodayPcsl();
     }
 
     @Override
-    public PsclVO queryMonthPcsl() {
+    public PcslVO queryMonthPcsl() {
         return  kmesBoardDao.queryMonthPcsl();
     }
 

gavel/src/main/java/com/gavel/kwell/vo/PsclVO.java → gavel/src/main/java/com/gavel/kwell/vo/PcslVO.java

@@ -3,15 +3,26 @@ package com.gavel.kwell.vo;
 import com.gavel.common.base.entity.BaseEntity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 
-public class PsclVO extends BaseEntity {
+public class PcslVO extends BaseEntity {
+
+	private Date pcrq;//日期
 
 	private Double jhsl;//计划总量
 
 	private Double wgsl;//完工总量
 
+	public Date getPcrq() {
+		return pcrq;
+	}
+
+	public void setPcrq(Date pcrq) {
+		this.pcrq = pcrq;
+	}
+
 	public Double getJhsl() {
 		return jhsl;
 	}