Merge remote-tracking branch 'origin/master'

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

@@ -24,6 +24,7 @@ import com.ozs.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,7 +34,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -58,6 +61,7 @@ public class PlanQuarterController extends BaseController {
     @ApiOperation(value = "查询季度计划")
     @PostMapping("/list")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.QUERY)
+    @PreAuthorize("@ss.hasPermi('plan:quarter:list')")
     public AjaxResult list(@RequestBody PlanQuarterStandardVo vo, HttpServletRequest request) {
         List<PlanQuarterResponseVo> planQuarterList = new ArrayList<>();
         try {
@@ -80,9 +84,12 @@ public class PlanQuarterController extends BaseController {
                 lw.ge(PlanQuarter::getPlanDemandSubTime, vo.getBeginTime());
             }
             if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
+                lw.le(PlanQuarter::getPlanDemandSubTime, parse);
             }
-            lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
+            lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
 
             LoginUser loginUser = tokenService.getLoginUser(request);
             // 添加数据权限
@@ -133,6 +140,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "审核单位查询季度计划")
     @PostMapping("/examineList")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:examineList')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.QUERY)
     public AjaxResult examineList(@RequestBody PlanQuarterStandardVo vo, HttpServletRequest request) {
         List<PlanQuarterResponseVo> planQuarterList = new ArrayList<>();
@@ -154,9 +162,12 @@ public class PlanQuarterController extends BaseController {
                 lw.ge(PlanQuarter::getPlanDemandSubTime, vo.getBeginTime());
             }
             if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
+                lw.le(PlanQuarter::getPlanDemandSubTime, parse);
             }
-            lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
+            lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
 
             LoginUser loginUser = tokenService.getLoginUser(request);
             // 添加数据权限
@@ -206,6 +217,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "导出季度计划数据")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('plan:quarter:exportPlan')")
     @PostMapping("/exportPlan")
     public void exportPlan(HttpServletResponse response, @RequestBody PlanQuarterStandardVo quarterStandardVo) throws Exception {
         List<PlanQuarterResponseVo> list = quarterService.selectPlanQuarterListEXP(quarterStandardVo);
@@ -215,6 +227,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "导出季度计划数据(审核单位)")
     @PostMapping("/exportPlanExamine")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:exportPlanExamine')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.EXPORT)
     public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanQuarterStandardVo quarterStandardVo) throws Exception {
         List<PlanQuarterResponseVo> list = quarterService.selectPlanQuarterExamineListEXP(quarterStandardVo);
@@ -224,6 +237,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "创建季度计划")
     @PostMapping("/add")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:add')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) {
         //获取采购单位-
@@ -235,6 +249,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "修改季度计划")
     @PostMapping("/update")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:update')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -244,6 +259,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "提交季度计划")
     @PostMapping("/commit")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:commit')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult commit(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.commit(quarterStandardVo);
@@ -251,6 +267,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "删除季度计划")
     @PostMapping("/delete")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:delete')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.deletePlanQuarterById(quarterStandardVo.getPlanPracticalId());
@@ -258,6 +275,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "根据id获取季度计划信息")
     @PostMapping("/view")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:view')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.QUERY)
     public AjaxResult view(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.view(quarterStandardVo);
@@ -265,6 +283,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "审核季度计划通过")
     @PostMapping("/reviewTo")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:reviewTo')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult reviewTo(@RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -274,6 +293,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "审核季度计划退回")
     @PostMapping("/reviewReturn")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:reviewReturn')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult reviewReturn(@RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -283,6 +303,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "申请修改季度计划")
     @PostMapping("/appUpdate")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:appUpdate')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult appUpdate(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.appUpdate(quarterStandardVo);
@@ -290,6 +311,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "发函催告")
     @PostMapping("/sendLetter")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:sendLetter')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult sendLetter(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.sendLetter(quarterStandardVo);
@@ -297,6 +319,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "上传计划关联文件后保存文件信息")
     @PostMapping("/upLoadPlanFile")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:upLoadPlanFile')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.OTHER)
     public AjaxResult upLoadPlanFile(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.upLoadPlanFile(quarterStandardVo);
@@ -310,6 +333,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "导入季度计划数据")
     @PostMapping("/importData")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:importData')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.INSERT)
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<PlanQuarterStandardVo> util = new ExcelUtil<>(PlanQuarterStandardVo.class);

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

@@ -24,6 +24,7 @@ import com.ozs.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,7 +35,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -59,6 +62,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "查询年度计划")
     @PostMapping("/list")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:list')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
@@ -80,10 +84,12 @@ public class PlanYearsController extends BaseController {
                 lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
             }
             if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
+                lw.le(PlanYears::getPlanDemandSubTime, parse);
             }
-            lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
-
+            lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
 
             LoginUser loginUser = tokenService.getLoginUser(request);
             // 添加数据权限
@@ -134,9 +140,11 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "审核单位查询年度计划")
     @PostMapping("/examineList")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:examineList')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
     public AjaxResult examineList(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
         List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
+
         try {
             LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
             if (!ObjectUtils.isEmpty(vo.getProjectName())) {
@@ -148,18 +156,17 @@ public class PlanYearsController extends BaseController {
             if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
                 lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
             }
-            if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
-                lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
-            } else {
-                lw.in(PlanYears::getProjectStatus, "1,3");
-            }
+
             if (!ObjectUtils.isEmpty(vo.getBeginTime())) {
                 lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
             }
             if (!ObjectUtils.isEmpty(vo.getEndTime())) {
-                lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+                Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
+                lw.le(PlanYears::getPlanDemandSubTime, parse);
             }
-            lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
+            lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
 
 
             LoginUser loginUser = tokenService.getLoginUser(request);
@@ -210,6 +217,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "导出年度计划数据")
     @PostMapping("/exportPlan")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:exportPlan')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.EXPORT)
     public void exportPlan(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
         List<PlanYearsResponseVo> list = planYearsService.selectPlanYearsListEXP(yearsStandardVo);
@@ -218,6 +226,7 @@ public class PlanYearsController extends BaseController {
     }
 
     @ApiOperation(value = "导出年度计划数据(审核单位)")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:exportPlanExamine')")
     @PostMapping("/exportPlanExamine")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.EXPORT)
     public void exportPlanExamine(HttpServletResponse response, @RequestBody PlanYearsStandardVo yearsStandardVo) throws Exception {
@@ -228,6 +237,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "创建年度计划")
     @PostMapping("/add")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:add')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         //获取采购单位-
@@ -239,6 +249,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "修改年度计划")
     @PostMapping("/update")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:update')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -248,6 +259,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "提交年度计划")
     @PostMapping("/commit")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:commit')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult commit(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.commit(yearsStandardVo);
@@ -255,6 +267,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "删除年度计划")
     @PostMapping("/delete")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:delete')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.deletePlanYearsById(yearsStandardVo.getPlanYearId());
@@ -262,6 +275,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "根据id获取年度计划信息")
     @PostMapping("/view")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:view')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
     public AjaxResult view(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.view(yearsStandardVo);
@@ -270,6 +284,7 @@ public class PlanYearsController extends BaseController {
     @ApiOperation(value = "审核年度计划通过")
     @PostMapping("/reviewTo")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('plan:planYears:reviewTo')")
     public AjaxResult reviewTo(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
         yearsStandardVo.setUpdated(String.valueOf(loginUser.getUserId()));
@@ -278,6 +293,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "审核年度计划退回")
     @PostMapping("/reviewReturn")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:reviewReturn')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult reviewReturn(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -287,6 +303,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "申请修改年度计划")
     @PostMapping("/appUpdate")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:appUpdate')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult appUpdate(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.appUpdate(yearsStandardVo);
@@ -294,6 +311,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "发函催告")
     @PostMapping("/sendLetter")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:sendLetter')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult sendLetter(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.sendLetter(yearsStandardVo);
@@ -301,6 +319,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "上传计划关联文件后保存文件信息")
     @PostMapping("/upLoadPlanFile")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:upLoadPlanFile')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.OTHER)
     public AjaxResult upLoadPlanFile(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.upLoadPlanFile(yearsStandardVo);
@@ -310,10 +329,10 @@ public class PlanYearsController extends BaseController {
     //@PostMapping("/downLoadPlanFile")
     //public AjaxResult downLoadPlanFile(@RequestBody PlanYearsStandardVo yearsStandardVo) {
     //    return planYearsService.downLoadPlanFile(yearsStandardVo);
-    //}
 
     @ApiOperation(value = "导入年度计划数据")
     @PostMapping("/importData")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:importData')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.INSERT)
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<PlanYearsStandardVo> util = new ExcelUtil<>(PlanYearsStandardVo.class);
@@ -323,9 +342,11 @@ public class PlanYearsController extends BaseController {
         String message = planYearsService.importPlanYears(planYears, updateSupport, loginUser);
         return success(message);
     }
+    //}
 
     @ApiOperation(value = "系统首页计划管理")
     @GetMapping("/planYearsTotal")
+    @PreAuthorize("@ss.hasPermi('plan:planYears:planYearsTotal')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
     public AjaxResult planYearsTotal() {
         return success(planYearsService.count());

purchase-admin/src/main/java/com/ozs/web/controller/statisticalAnalysis/StatisticalAnalysisController.java

@@ -256,13 +256,13 @@ public class StatisticalAnalysisController extends BaseController {
             OutputStream outputStream = new FileOutputStream(file.getFileMappingPath());
             document.write(outputStream);
             outputStream.close();
-            return AjaxResult.success("cg");
+            return AjaxResult.success("分析文档已生成");
         } catch (IOException e) {
             e.printStackTrace();
         } catch (InvalidFormatException e) {
             e.printStackTrace();
         }
-        return AjaxResult.success("wg");
+        return AjaxResult.success("分析文档已生成");
     }
 
 

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

@@ -110,7 +110,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
-                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
+                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -152,7 +152,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
-                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
+                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -379,6 +379,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         demand.setEvaluation(byId.getEvaluation().doubleValue());
         BeanUtils.copyProperties(byId, demand);
         demand.setPlanId(byId.getPlanPracticalId());
+        demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
         //同步到项目管理状态为需求待填制
         demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
         demand.setCreateTime(new Date());

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

@@ -148,7 +148,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
-                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
+                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -454,6 +454,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
             demand.setPlanId(quarters.getPlanPracticalId());
             demand.setEvaluation(byId.getEvaluation().doubleValue());
             demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
+            demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
             demand.setCreateTime(new Date());
             pmDemandMapper.insert(demand);
             //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
@@ -1158,12 +1159,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Override
     public List<PlanQuarterResponseVo> willSendLetter() {
         LambdaQueryWrapper<PlanYears> yearsLp = new LambdaQueryWrapper<PlanYears>();
-        yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
+        yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         yearsLp.eq(PlanYears::getSendLetter, "1");
         List<PlanYears> planYears = planYearsMapper.selectList(yearsLp);
 
         LambdaQueryWrapper<PlanQuarter> quarterLp = new LambdaQueryWrapper<PlanQuarter>();
-        quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
+        quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         quarterLp.eq(PlanQuarter::getSendLetter, "1");
         List<PlanQuarter> planQuarters = planQuarterMapper.selectList(quarterLp);
         //融合一起
@@ -1173,12 +1174,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     public List<PlanQuarterResponseVo> getListByProjectStatus(String projectStatus) {
         LambdaQueryWrapper<PlanYears> yearsLp = new LambdaQueryWrapper<PlanYears>();
-        yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
+        yearsLp.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         yearsLp.eq(PlanYears::getProjectStatus, projectStatus);
         List<PlanYears> planYears = planYearsMapper.selectList(yearsLp);
 
         LambdaQueryWrapper<PlanQuarter> quarterLp = new LambdaQueryWrapper<PlanQuarter>();
-        quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
+        quarterLp.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
         quarterLp.eq(PlanQuarter::getProjectStatus, projectStatus);
         List<PlanQuarter> planQuarters = planQuarterMapper.selectList(quarterLp);
         //融合一起

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

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.common.exception.base.BaseException;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysProcurementStandardMapper;
@@ -28,6 +29,7 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.spring.SpringUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 
@@ -135,13 +137,17 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public Map<String, Object> selectDeptById(Long deptId)
     {
+        Map<String, Object> returnMap = new HashMap<>();
         SysDept sysDept = deptMapper.selectDeptById(deptId);
         SysDeptResponseVo sysDeptResponseVo = new SysDeptResponseVo();
+        if(ObjectUtils.isEmpty(sysDept)){
+            throw new BaseException("deptId为"+deptId+"的单位不存在");
+        }
         BeanUtils.copyProperties(sysDept, sysDeptResponseVo);
         QueryWrapper<SysProcurementStandard> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dept_id",deptId);
         List<SysProcurementStandard> sysProcurementStandardsList = sysProcurementStandardMapper.selectList(queryWrapper);
-        Map<String, Object> returnMap = new HashMap<>();
+
         returnMap.put("sysDept",sysDeptResponseVo);
         returnMap.put("sysProcurementStandardsList",sysProcurementStandardsList);
         returnMap.put("dto",sysDept);