时间区间查询

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

@@ -1,11 +1,9 @@
 package com.ozs.web.controller.plan;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
-import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.plan.doman.PlanYears;
@@ -20,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -88,13 +87,17 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "审核年度计划通过")
     @PostMapping("/reviewTo")
-    public AjaxResult reviewTo(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+    public AjaxResult reviewTo(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        yearsStandardVo.setUpdated(String.valueOf(loginUser.getUserId()));
         return planYearsService.reviewTo(yearsStandardVo);
     }
 
     @ApiOperation(value = "审核年度计划退回")
     @PostMapping("/reviewReturn")
-    public AjaxResult reviewReturn(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+    public AjaxResult reviewReturn(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        yearsStandardVo.setUpdated(String.valueOf(loginUser.getUserId()));
         return planYearsService.reviewReturn(yearsStandardVo);
     }
 
@@ -133,5 +136,14 @@ public class PlanYearsController extends BaseController {
         return success(message);
     }
 
+    @ApiOperation(value = "导出年度计划数据")
+    @PostMapping("/exportPlan")
+    public void exportPlan(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
+        PageInfo<PlanYears> page = planYearsService.selectPlanYearsList(yearsStandardVo);
+        List<PlanYears> list = page.getList();
+        ExcelUtil<PlanYears> util = new ExcelUtil<>(PlanYears.class);
+        util.exportExcel(response, list, "年度计划数据");
+    }
+
 
 }

purchase-admin/src/main/resources/application.yml

@@ -10,4 +10,4 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,test
+    active: druid,dev

purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
 import lombok.Data;
 import nonapi.io.github.classgraph.json.Id;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -19,7 +17,7 @@ import java.util.Date;
  * @author buzhanyi
  */
 @Data
-public class PlanYears {
+public class PlanYears implements Serializable {
 
     /**
      * 主键编号

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

@@ -2,12 +2,12 @@ package com.ozs.plan.doman.vo.requestVo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.core.domain.BaseEntity;
 import com.ozs.common.vo.PageVo;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author buzhanyi
  */
 @Data
-public class PlanYearsStandardVo extends PageVo {
+public class PlanYearsStandardVo extends PageVo implements Serializable {
 
     /**
      * 主键编号

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -6,6 +6,7 @@ import com.ozs.common.annotation.Excel;
 import com.ozs.system.domain.SysFileRef;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -15,7 +16,7 @@ import java.util.List;
  * @author buzhanyi
  */
 @Data
-public class PlanYearsResponseVo {
+public class PlanYearsResponseVo implements Serializable {
 
     /**
      * 主键编号

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

@@ -346,6 +346,10 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(vo.getPlanYearId());
                 ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
+                ref.setCreated(vo.getUpdated());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(new Date());
                 sysFileRefMapper.insert(ref);
             }
         }

purchase-system/src/main/java/com/ozs/system/domain/SysFileRef.java

@@ -9,6 +9,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * 附件关联对象 sys_file_ref
  *

purchase-system/src/main/resources/mapper/plan/PlanYearsMapper.xml

@@ -65,10 +65,10 @@
 			<if test="projectStatus != null and projectStatus != ''">
 				AND project_status = #{projectStatus}
 			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
 			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
 				and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
 			</if>
 			and del_flay=0
@@ -94,10 +94,10 @@
 			<if test="projectStatus != null and projectStatus != ''">
 				AND project_status = #{projectStatus}
 			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
 			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
 				and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
 			</if>
 			and del_flay=0