Преглед на файлове

系统首页代码开发

gao.qiang преди 2 години
родител
ревизия
fcb53e090a
променени са 23 файла, в които са добавени 860 реда и са изтрити 8 реда
  1. 61 0
      purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java
  2. 79 0
      purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNotificationMessageController.java
  3. 96 0
      purchase-admin/src/main/java/com/ozs/web/controller/home/SystemHomepageController.java
  4. 6 1
      purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java
  5. 1 1
      purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysProcurementStandard.java
  6. 49 0
      purchase-system/src/main/java/com/ozs/home/domain/HomeNotice.java
  7. 51 0
      purchase-system/src/main/java/com/ozs/home/domain/HomeNotificationMessage.java
  8. 25 0
      purchase-system/src/main/java/com/ozs/home/domain/vo/HomeNoticeVo.java
  9. 28 0
      purchase-system/src/main/java/com/ozs/home/domain/vo/HomeNotificationMessageVo.java
  10. 18 0
      purchase-system/src/main/java/com/ozs/home/domain/vo/ReasonsForLagVo.java
  11. 15 0
      purchase-system/src/main/java/com/ozs/home/mapper/HomeNoticeMapper.java
  12. 15 0
      purchase-system/src/main/java/com/ozs/home/mapper/HomeNotificationMessageMapper.java
  13. 20 0
      purchase-system/src/main/java/com/ozs/home/service/HomeNoticeService.java
  14. 14 0
      purchase-system/src/main/java/com/ozs/home/service/HomeNotificationMessageService.java
  15. 18 0
      purchase-system/src/main/java/com/ozs/home/service/impl/HomeNoticeServiceImpl.java
  16. 21 0
      purchase-system/src/main/java/com/ozs/home/service/impl/HomeNotificationMessageServiceImpl.java
  17. 62 1
      purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java
  18. 262 2
      purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java
  19. 3 1
      purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java
  20. 1 1
      purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysProcurementStandardVo.java
  21. 7 0
      purchase-system/src/main/resources/mapper/home/HomeNoticeMapper.xml
  22. 7 0
      purchase-system/src/main/resources/mapper/home/HomeNotificationMessageMapper.xml
  23. 1 1
      purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

+ 61 - 0
purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -0,0 +1,61 @@
+package com.ozs.web.controller.home;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.annotation.Log;
+import com.ozs.common.constant.ModularConstans;
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.home.domain.HomeNotice;
+import com.ozs.home.domain.vo.HomeNoticeVo;
+import com.ozs.home.service.HomeNoticeService;
+import io.swagger.annotations.ApiOperation;
+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;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 首页公告控制层
+ *
+ * @author buzhanyi
+ */
+@RestController
+@RequestMapping("/home/homeNotice")
+public class HomeNoticeController extends BaseController {
+    
+    @Resource
+    private  HomeNoticeService homeNoticeService;
+
+    @ApiOperation(value = "查询首页公告")
+    @PostMapping("/selectHomeNotice")
+    @PreAuthorize("@ss.hasPermi('home:homeNotice:selecthomeNotice')")
+    @Log(title = ModularConstans.notice, businessType = BusinessType.QUERY)
+    public AjaxResult selectHomeNotice(@RequestBody HomeNoticeVo homeNoticeVo) {
+        LambdaQueryWrapper<HomeNotice> lw = new LambdaQueryWrapper<HomeNotice>();
+        if (!StringUtils.isBlank(homeNoticeVo.getNoticeName())) {
+            lw.like(HomeNotice::getNoticeName, "%" + homeNoticeVo.getNoticeName() + "%");
+        }
+        if (!StringUtils.isBlank(homeNoticeVo.getAnnouncementClassification())) {
+            lw.eq(HomeNotice::getAnnouncementClassification, homeNoticeVo.getAnnouncementClassification());
+        }
+        if (!StringUtils.isBlank(homeNoticeVo.getHomepageClassification())) {
+            lw.eq(HomeNotice::getHomepageClassification, homeNoticeVo.getHomepageClassification());
+        }
+        if(!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())){
+            lw.ge(HomeNotice::getNoticeTime,homeNoticeVo.getNoticeTime());
+        }
+        if(!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())){
+            lw.le(HomeNotice::getNoticeTime,homeNoticeVo.getNoticeTime());
+        }
+        IPage<HomeNotice> page = homeNoticeService.page(new Page<HomeNotice>(homeNoticeVo.getPageNum(), homeNoticeVo.getPageSize()), lw);
+        return success(page);
+    }
+}

+ 79 - 0
purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNotificationMessageController.java

@@ -0,0 +1,79 @@
+package com.ozs.web.controller.home;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.annotation.Log;
+import com.ozs.common.constant.ModularConstans;
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.R;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.home.domain.HomeNotificationMessage;
+import com.ozs.home.domain.vo.HomeNotificationMessageVo;
+import com.ozs.home.domain.vo.ReasonsForLagVo;
+import com.ozs.home.service.HomeNotificationMessageService;
+import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.mapper.PmDemandMapper;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 首页通知消息
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/home/homeNotificationMessage")
+public class HomeNotificationMessageController extends BaseController {
+
+    @Resource
+    private HomeNotificationMessageService homeNotificationMessageService;
+    @Resource
+    private PmDemandMapper pmDemandMapper;
+
+    @ApiOperation(value = "查询首页通知消息")
+    @PostMapping("/selectHomeNotificationMessage")
+    @PreAuthorize("@ss.hasPermi('home:homeNotificationMessage:selectHomeNotificationMessage')")
+    @Log(title = ModularConstans.notice, businessType = BusinessType.QUERY)
+    public AjaxResult selectHomeNotificationMessage(@RequestBody HomeNotificationMessageVo homeNotificationMessageVo) {
+        LambdaQueryWrapper<HomeNotificationMessage> lw = new LambdaQueryWrapper<HomeNotificationMessage>();
+        if (!StringUtils.isBlank(homeNotificationMessageVo.getHomepageClassification())) {
+            lw.eq(HomeNotificationMessage::getHomepageClassification, homeNotificationMessageVo.getHomepageClassification());
+        }
+        if (!StringUtils.isBlank(homeNotificationMessageVo.getMessageClassification())) {
+            lw.eq(HomeNotificationMessage::getMessageClassification, homeNotificationMessageVo.getMessageClassification());
+        }
+        IPage<HomeNotificationMessage> page = homeNotificationMessageService.page(new Page<HomeNotificationMessage>(homeNotificationMessageVo.getPageNum(), homeNotificationMessageVo.getPageSize()), lw);
+        return success(page);
+    }
+
+
+    @ApiOperation(value = "填写滞后原因")
+    @PostMapping("/saveReasonsForLag")
+    @PreAuthorize("@ss.hasPermi('home:homeNotificationMessage:saveReasonsForLag')")
+    @Log(title = ModularConstans.notice, businessType = BusinessType.UPDATE)
+    public AjaxResult saveReasonsForLag(@RequestBody ReasonsForLagVo reasonsForLagVo) {
+        HomeNotificationMessage homeNotificationMessage = homeNotificationMessageService.getById(reasonsForLagVo.getHomeNotificationMessageId());
+        homeNotificationMessage.setState(0);
+        QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("demand_id", homeNotificationMessage.getDemandId());
+        PmDemand pmDemand = pmDemandMapper.selectOne(queryWrapper);
+        pmDemand.setDelayReason(reasonsForLagVo.getDelayReason());
+        pmDemand.setAdjustAdvice(reasonsForLagVo.getAdjustAdvice());
+        if (pmDemandMapper.updateById(pmDemand) > 0 && homeNotificationMessageService.updateById(homeNotificationMessage)) {
+            return success();
+        } else {
+            return error();
+        }
+    }
+}

+ 96 - 0
purchase-admin/src/main/java/com/ozs/web/controller/home/SystemHomepageController.java

@@ -0,0 +1,96 @@
+package com.ozs.web.controller.home;
+
+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.utils.poi.ExcelUtil;
+import com.ozs.framework.web.service.TokenService;
+import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
+import com.ozs.plan.service.PlanYearsService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+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;
+
+/**
+ * 系统首页控制层
+ *
+ * @author buzhanyi
+ */
+@RestController
+@RequestMapping("/home/systemHomepage")
+public class SystemHomepageController extends BaseController {
+    @Autowired
+    private PlanYearsService planYearsService;
+
+    @ApiOperation(value = "需求单位首页计划管理总数")
+    @PostMapping("/demandUnit/planManagement/total")
+    public AjaxResult demandUnitPlanManagementTotal() {
+        return planYearsService.demandUnitPlanManagementTotal();
+    }
+
+    @ApiOperation(value = "采购管理部门首页计划管理总数")
+    @PostMapping("/purchasingManagement/planManagement/total")
+    public AjaxResult purchasingManagementPurchasingManagementTotal() {
+        return planYearsService.purchasingManagementPurchasingManagementTotal();
+    }
+
+    @ApiOperation(value = "需求单位首页需求管理总数")
+    @PostMapping("/demandUnit/demandManagement/total")
+    public AjaxResult demandUnitDemandManagementTotal() {
+        return planYearsService.demandUnitDemandManagementTotal();
+    }
+
+    @ApiOperation(value = "采购管理部门首页需求管理总数")
+    @PostMapping("/purchasingManagement/demandManagement/total")
+    public AjaxResult purchasingManagementDemandManagementTotal() {
+        return planYearsService.purchasingManagementDemandManagementTotal();
+    }
+
+    @ApiOperation(value = "需求单位首页合同管理总数")
+    @PostMapping("/demandUnit/contractManagement/total")
+    public AjaxResult demandUnitContractManagementTotal() {
+        return planYearsService.demandUnitContractManagementTotal();
+    }
+
+    @ApiOperation(value = "需求单位首页建设管理总数")
+    @PostMapping("/demandUnit/constructionManagement/total")
+    public AjaxResult demandUnitConstructionManagementTotal() {
+        return planYearsService.demandUnitConstructionManagementTotal();
+    }
+
+    @ApiOperation(value = "采购管理部门首页任务下达管理总数")
+    @PostMapping("/purchasingManagement/taskRelease/total")
+    public AjaxResult purchasingManagementTaskReleaseTotal() {
+        return planYearsService.purchasingManagementTaskReleaseTotal();
+    }
+
+    @ApiOperation(value = "采购办首页采购执行管理总数")
+    @PostMapping("/procurementOffice/procurementExecution/total")
+    public AjaxResult procurementOfficeProcurementExecutionTotal() {
+        return planYearsService.procurementOfficeProcurementExecutionTotal();
+    }
+
+    @ApiOperation(value = "采购办首已中标项目理总数")
+    @PostMapping("/procurementOffice/winningTheBid/total")
+    public AjaxResult procurementOfficeWinningTheBidTotal() {
+        return planYearsService.procurementOfficeWinningTheBidTotal();
+    }
+
+    @ApiOperation(value = "采购办首未中标项目理总数")
+    @PostMapping("/procurementOffice/failureToWinTheBid/total")
+    public AjaxResult procurementOfficeFailureToWinTheBidTotal() {
+        return planYearsService.procurementOfficeFailureToWinTheBidTotal();
+    }
+    
+}

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

@@ -11,6 +11,7 @@ import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.service.PlanYearsService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -154,5 +155,9 @@ public class PlanYearsController extends BaseController {
         return success(message);
     }
 
-
+    @ApiOperation(value = "系统首页计划管理")
+    @GetMapping("/planYearsTotal")
+    public AjaxResult planYearsTotal(){
+     return    success(planYearsService.count());
+    }
 }

+ 1 - 1
purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysProcurementStandard.java

@@ -27,7 +27,7 @@ public class SysProcurementStandard implements Serializable {
     @TableField("dept_id")
     private Long deptId;
 
-    /** 类别(0装备类1服务类2装备类3工程类) */
+    /** 类别(0装备类1服务类2物资类3工程类) */
     @ApiModelProperty(value = "类别")
     @TableField("category")
     private Integer category;

+ 49 - 0
purchase-system/src/main/java/com/ozs/home/domain/HomeNotice.java

@@ -0,0 +1,49 @@
+package com.ozs.home.domain;
+
+
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 首页公告
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("首页公告")
+public class HomeNotice extends BaseEntity {
+
+    /** 主键 */
+    private Long homeNoticeId;
+
+    /** 首页分类(0需求单位首页1采购管理部门首页2采购部首页) */
+    private Integer homepageClassification;
+
+    /** 公告分类(0采购公告1中标公告2流标公告) */
+    private Integer announcementClassification;
+
+    /** 公告名称 */
+    private String noticeName;
+
+    /** 公告时间 */
+    private Date noticeTime;
+
+    /** 采购项目编号 */
+    private Long projectNo;
+
+    /** 合同履行日期 */
+    private String performanceDate;
+
+    /** 采购项目名称 */
+    private String projectName;
+}

+ 51 - 0
purchase-system/src/main/java/com/ozs/home/domain/HomeNotificationMessage.java

@@ -0,0 +1,51 @@
+package com.ozs.home.domain;
+
+
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 首页通知消息
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("首页通知消息")
+public class HomeNotificationMessage extends BaseEntity {
+
+    /** 主键 */
+    private Long homeNotificationMessageId;
+
+    /** 首页分类(0需求单位首页1采购管理部门首页2采购部首页) */
+    private Integer homepageClassification;
+
+    /** 公消息分类(0预警消息1.发函催告2.预期告警) */
+    private Integer messageClassification;
+    
+    /** 项目类型(0:装备类;1:物资类;2:服务类;3:工程类) */
+    private String projectType;
+
+    /** 计划提报需求时间 */
+    private Date planDemandSubTime;
+
+    /** 是否填写完成滞后原因(0是1否) */
+    private Integer state;
+
+    /** 需求概况 */
+    private String demandOverview;
+
+    /** 采购项目名称 */
+    private String projectName;
+
+    /** 采购需求id */
+    private Long demandId;
+}

+ 25 - 0
purchase-system/src/main/java/com/ozs/home/domain/vo/HomeNoticeVo.java

@@ -0,0 +1,25 @@
+package com.ozs.home.domain.vo;
+
+
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author buzhanyi
+ */
+@Data
+public class HomeNoticeVo extends PageVo {
+    /** 首页分类(0需求单位首页1采购管理部门首页2采购部首页) */
+    private String homepageClassification;
+
+    /** 公告分类(0采购公告1中标公告2流标公告) */
+    private String announcementClassification;
+
+    /** 公告名称 */
+    private String noticeName;
+
+    /** 公告时间 */
+    private Date noticeTime;
+}

+ 28 - 0
purchase-system/src/main/java/com/ozs/home/domain/vo/HomeNotificationMessageVo.java

@@ -0,0 +1,28 @@
+package com.ozs.home.domain.vo;
+
+
+import com.ozs.common.core.domain.BaseEntity;
+import com.ozs.common.vo.PageVo;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 首页通知消息
+ * @author Administrator
+ */
+@Data
+
+public class HomeNotificationMessageVo extends PageVo {
+    
+
+    /** 首页分类(0需求单位首页1采购管理部门首页2采购部首页) */
+    private String homepageClassification;
+
+    /** 公消息分类(0预警消息1.发函催告2.预期告警) */
+    private String messageClassification;
+}

+ 18 - 0
purchase-system/src/main/java/com/ozs/home/domain/vo/ReasonsForLagVo.java

@@ -0,0 +1,18 @@
+package com.ozs.home.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 滞后原因
+ * @author Administrator
+ */
+@Data
+public class ReasonsForLagVo {
+    /** 滞后原因 */
+    private String delayReason;
+
+    /** 调整建议 */
+    private String adjustAdvice;
+    /** 主键 */
+    private Long homeNotificationMessageId;
+}

+ 15 - 0
purchase-system/src/main/java/com/ozs/home/mapper/HomeNoticeMapper.java

@@ -0,0 +1,15 @@
+package com.ozs.home.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.home.domain.HomeNotice;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 首页公告 数据层
+ *
+ * @author bu
+ */
+@Mapper
+public interface HomeNoticeMapper extends BaseMapper<HomeNotice> {
+}

+ 15 - 0
purchase-system/src/main/java/com/ozs/home/mapper/HomeNotificationMessageMapper.java

@@ -0,0 +1,15 @@
+package com.ozs.home.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.home.domain.HomeNotificationMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 首页通知消息 数据层
+ *
+ * @author bu
+ */
+@Mapper
+public interface HomeNotificationMessageMapper extends BaseMapper<HomeNotificationMessage> {
+}

+ 20 - 0
purchase-system/src/main/java/com/ozs/home/service/HomeNoticeService.java

@@ -0,0 +1,20 @@
+package com.ozs.home.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.home.domain.HomeNotice;
+import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
+
+import java.util.List;
+
+/**
+ * 首页公告 服务层
+ *
+ * @author bu
+ */
+public interface HomeNoticeService extends IService<HomeNotice> {
+}

+ 14 - 0
purchase-system/src/main/java/com/ozs/home/service/HomeNotificationMessageService.java

@@ -0,0 +1,14 @@
+package com.ozs.home.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.home.domain.HomeNotice;
+import com.ozs.home.domain.HomeNotificationMessage;
+
+/**
+ * 首页通知消息 服务层
+ *
+ * @author bu
+ */
+public interface HomeNotificationMessageService extends IService<HomeNotificationMessage> {
+}

+ 18 - 0
purchase-system/src/main/java/com/ozs/home/service/impl/HomeNoticeServiceImpl.java

@@ -0,0 +1,18 @@
+package com.ozs.home.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.home.domain.HomeNotice;
+import com.ozs.home.mapper.HomeNoticeMapper;
+import com.ozs.home.service.HomeNoticeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author buzhanyi
+ */
+@Service
+@Slf4j
+public class HomeNoticeServiceImpl extends ServiceImpl<HomeNoticeMapper, HomeNotice> implements HomeNoticeService {
+    
+}

+ 21 - 0
purchase-system/src/main/java/com/ozs/home/service/impl/HomeNotificationMessageServiceImpl.java

@@ -0,0 +1,21 @@
+package com.ozs.home.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.home.domain.HomeNotice;
+import com.ozs.home.domain.HomeNotificationMessage;
+import com.ozs.home.mapper.HomeNoticeMapper;
+import com.ozs.home.mapper.HomeNotificationMessageMapper;
+import com.ozs.home.service.HomeNoticeService;
+import com.ozs.home.service.HomeNotificationMessageService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author buzhanyi
+ */
+@Service
+@Slf4j
+public class HomeNotificationMessageServiceImpl extends ServiceImpl<HomeNotificationMessageMapper, HomeNotificationMessage> implements HomeNotificationMessageService {
+    
+}

+ 62 - 1
purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -2,11 +2,13 @@ package com.ozs.plan.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
+import com.ozs.system.domain.SysOperLog;
 
 import java.util.List;
 
@@ -15,7 +17,7 @@ import java.util.List;
  *
  * @author bu
  */
-public interface PlanYearsService {
+public interface PlanYearsService extends IService<PlanYears> {
 
     /**
      * 查询年度计划记录集合
@@ -134,4 +136,63 @@ public interface PlanYearsService {
      * @return 结果
      */
     AjaxResult downLoadPlanFile(PlanYearsStandardVo yearsStandardVo);
+    /**
+     * 需求单位首页计划管理总数
+     * @return
+     */
+    AjaxResult demandUnitPlanManagementTotal();
+
+    /**
+     * 采购管理部门首页计划管理总数
+     * @return
+     */
+    AjaxResult purchasingManagementPurchasingManagementTotal();
+
+    /**
+     * 需求单位首页需求管理总数
+     * @return
+     */
+    AjaxResult demandUnitDemandManagementTotal();
+
+    /**
+     * 采购管理部门首页需求管理总数
+     * @return
+     */
+    AjaxResult purchasingManagementDemandManagementTotal();
+
+    /**
+     * 需求单位首页合同管理总数
+     * @return
+     */
+    AjaxResult demandUnitContractManagementTotal();
+
+    /**
+     * 需求单位首页建设管理总数
+     * @return
+     */
+    AjaxResult demandUnitConstructionManagementTotal();
+
+    /**
+     * 采购管理部门首页任务下达管理总数
+     * @return
+     */
+    AjaxResult purchasingManagementTaskReleaseTotal();
+
+    /**
+     * 采购办首页采购执行管理总数
+     * @return
+     */
+    AjaxResult procurementOfficeProcurementExecutionTotal();
+
+    /**
+     * 采购办首已中标项目理总数
+     * @return
+     */
+    AjaxResult procurementOfficeWinningTheBidTotal();
+
+    /**
+     * 采购办首未中标项目理总数 
+     * @return
+     */ 
+    AjaxResult procurementOfficeFailureToWinTheBidTotal();
 }

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

@@ -1,17 +1,29 @@
 package com.ozs.plan.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ozs.base.domain.BaseAgency;
+import com.ozs.base.domain.BaseNoticeType;
+import com.ozs.base.vo.BaseNoticeVo;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.enums.IsExcess;
+import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.plan.doman.PlanYears;
@@ -19,13 +31,23 @@ import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanYearsService;
+import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
+import com.ozs.system.domain.SysOperLog;
+import com.ozs.system.domain.SysUserRole;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
+import com.ozs.system.mapper.SysOperLogMapper;
+import com.ozs.system.mapper.SysProcurementStandardMapper;
+import com.ozs.system.mapper.SysRoleMapper;
+import com.ozs.system.mapper.SysUserRoleMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
+import com.ozs.system.service.ISysRoleService;
+import com.ozs.system.service.ISysUserService;
 import com.ozs.system.service.SysFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,13 +63,16 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * @author buzhanyi
  */
 @Service
 @Slf4j
-public class PlanYearsServiceImpl implements PlanYearsService {
+public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears> implements PlanYearsService {
 
     @Autowired
     PlanYearsMapper planYearsMapper;
@@ -63,7 +88,14 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     private SysDeptMapper deptMapper;
     @Autowired
     private SysFileService fileService;
-
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+    @Autowired
+    private ISysUserService userService;
+    @Autowired
+    private SysProcurementStandardMapper sysProcurementStandardMapper;
+    @Autowired
+    private PmDemandMapper pmDemandMapper;
     @Override
     public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
@@ -401,6 +433,234 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return AjaxResult.success();
     }
 
+    @Override
+    public AjaxResult demandUnitPlanManagementTotal() {
+        List<PlanYears> planYears = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
+                planYears = planYearsMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(planYears.size());
+    }
+
+    @Override
+    public AjaxResult purchasingManagementPurchasingManagementTotal() {
+        List<PlanYears> planYears = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .or(wrapper -> wrapper.lambda().eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
+                        .eq(PlanYears::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                        .or(wrapper -> wrapper.lambda().in(PlanYears::getPurchaseDeptId, sysDepts)
+                        .eq(PlanYears::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .in("project_status",ProjectStatus.PLANWAIEXAMINE,ProjectStatus.PLANTOEXAMINE);
+                planYears = planYearsMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(planYears.size());
+    }
+
+    @Override
+    public AjaxResult demandUnitDemandManagementTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
+                pmDemands =pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult purchasingManagementDemandManagementTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                                .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                                .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .in("project_status",PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(),PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult demandUnitContractManagementTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
+                queryWrapper.in("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode(),PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+                pmDemands =pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult demandUnitConstructionManagementTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
+                queryWrapper.in("project_status",PmProjectStatus.UNDER_CONSTRUCTION.getCode(),PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
+                pmDemands =pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult purchasingManagementTaskReleaseTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                                .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                                .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .in("project_status",PmProjectStatus.TASK_WAIT_RELEASE.getCode(),PmProjectStatus.BID_INFO_WAIT_FILL.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult procurementOfficeProcurementExecutionTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                                .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                                .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .in("project_status",PmProjectStatus.BID_INFO_WAIT_FILL.getCode(),PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult procurementOfficeWinningTheBidTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                                .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                                .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .lt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
+    @Override
+    public AjaxResult procurementOfficeFailureToWinTheBidTotal() {
+        List<PmDemand> pmDemands = new ArrayList<>();
+        try {
+            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
+            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("demand_unit")).collect(Collectors.toList());
+            if (sysRoleList.size() > 0) {
+                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
+                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
+                List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
+                queryWrapper
+                        .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
+                                .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                        .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, sysDepts)
+                                .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .gt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return AjaxResult.success(pmDemands.size());
+    }
+
     //判断是否为超额计划
     public String isExcessOrNo(String projectType, BigDecimal evaluation) {
         BigDecimal threshold = new BigDecimal(0);

+ 3 - 1
purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -1,5 +1,7 @@
 package com.ozs.pm.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.plan.doman.PlanYears;
 import com.ozs.pm.doman.PmDemand;
 
 import java.util.List;
@@ -11,7 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface PmDemandMapper 
+public interface PmDemandMapper extends BaseMapper<PmDemand>
 {
     /**
      * 查询采购需求

+ 1 - 1
purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysProcurementStandardVo.java

@@ -23,7 +23,7 @@ public class SysProcurementStandardVo implements Serializable {
     @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
-    /** 类别(0装备类1服务类2装备类3工程类) */
+    /** 类别(0装备类1服务类2物资类3工程类) */
     @ApiModelProperty(value = "类别")
     private Integer category;
 

+ 7 - 0
purchase-system/src/main/resources/mapper/home/HomeNoticeMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.home.mapper.HomeNoticeMapper">
+
+</mapper>

+ 7 - 0
purchase-system/src/main/resources/mapper/home/HomeNotificationMessageMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.home.mapper.HomeNotificationMessageMapper">
+
+</mapper>

+ 1 - 1
purchase-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -60,7 +60,7 @@
     </select>
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
+		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.remarks,d.address,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}