DeBugDeBugDeBug

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -93,17 +93,21 @@ public class PlanYearsController extends BaseController {
             if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
                 lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
             }
+            if (!ObjectUtils.isEmpty(vo.getProjectType())) {
+                lw.eq(PlanYears::getProjectType, vo.getProjectType());
+            }
             if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
                 lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
             }
             if (!ObjectUtils.isEmpty(vo.getParams())) {
                 if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {
-                    lw.ge(PlanYears::getPlanDemandSubTime, vo.getParams().get("beginTime"));
+                    lw.ge(PlanYears::getPlanDemandSubTime, vo.getParams().get("beginTime").toString() + "-01");
                 }
                 if (!ObjectUtils.isEmpty(vo.getParams().get("endTime"))) {
-                    SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                    Date parse = dateFormatT.parse(vo.getParams().get("endTime").toString() + " 23:59:59:999");
-                    lw.le(PlanYears::getPlanDemandSubTime, parse);
+                    SimpleDateFormat dateFormaH = new SimpleDateFormat("yyyy-MM");
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                    Date ofMonth = DateUtils.getLastDayOfMonth(dateFormaH.parse(vo.getParams().get("endTime").toString()));
+                    lw.le(PlanYears::getPlanDemandSubTime, dateFormat.format(ofMonth) + " 23:59:59:999");
                 }
             }
             lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanYearsStandardVo.java

@@ -46,7 +46,7 @@ public class PlanYearsStandardVo extends PageVo {
      * 项目类型（1：装备类；2：物资类；3：服务类；）
      */
     @Excel(name = "项目类型")
-    @ApiModelProperty(value = "项目类型不能为空（1：装备类；2：物资类；3：服务类；）")
+    @ApiModelProperty(value = "项目类型不能为空（0装备类,1物资类,2服务类,3工程类")
     private String projectType;
 
     /**

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -125,12 +125,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
                 if (!ObjectUtils.isEmpty(vo.getParams())) {
                     if (!ObjectUtils.isEmpty(vo.getParams().get("beginTime"))) {
-                        lw.ge(PlanYears::getPlanDemandSubTime, vo.getParams().get("beginTime"));
+                        lw.ge(PlanYears::getPlanDemandSubTime, vo.getParams().get("beginTime").toString() + "-01");
                     }
                     if (!ObjectUtils.isEmpty(vo.getParams().get("endTime"))) {
-                        SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-                        Date parse = dateFormatT.parse(vo.getParams().get("endTime").toString() + " 23:59:59:999");
-                        lw.le(PlanYears::getPlanDemandSubTime, parse);
+                        SimpleDateFormat dateFormaH = new SimpleDateFormat("yyyy-MM");
+                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                        Date ofMonth = DateUtils.getLastDayOfMonth(dateFormaH.parse(vo.getParams().get("endTime").toString()));
+                        lw.le(PlanYears::getPlanDemandSubTime, dateFormat.format(ofMonth) + " 23:59:59:999");
                     }
                 }
                 lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());