Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseExpertController.java

@@ -71,14 +71,14 @@ public class BaseExpertController extends BaseController {
     @PostMapping("/selectExpert")
     public AjaxResult selectExpert(@RequestBody BaseExpertVo baseExpertVo) {
         LambdaQueryWrapper<BaseExpert> lw = new LambdaQueryWrapper<BaseExpert>();
-        if (!StringUtils.isBlank(baseExpertVo.getExpertNameVo())) {
-            lw.like(BaseExpert::getExpertName, baseExpertVo.getExpertNameVo());
+        if (!StringUtils.isBlank(baseExpertVo.getExpertName())) {
+            lw.like(BaseExpert::getExpertName, baseExpertVo.getExpertName());
         }
-        if (!StringUtils.isBlank(baseExpertVo.getMajorTypeVo())) {
-            lw.eq(BaseExpert::getMajorType, baseExpertVo.getMajorTypeVo());
+        if (!StringUtils.isBlank(baseExpertVo.getMajorType())) {
+            lw.eq(BaseExpert::getMajorType, baseExpertVo.getMajorType());
         }
-        if (!ObjectUtils.isEmpty(baseExpertVo.getMajorGradeVo())) {
-            lw.eq(BaseExpert::getMajorGrade, baseExpertVo.getMajorGradeVo());
+        if (!ObjectUtils.isEmpty(baseExpertVo.getMajorGrade())) {
+            lw.eq(BaseExpert::getMajorGrade, baseExpertVo.getMajorGrade());
         }
         IPage<BaseExpert> page = baseExpertService.page(new Page<BaseExpert>(baseExpertVo.getPageNum(), baseExpertVo.getPageSize()), lw);
         return success(page);

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

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.plan;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -37,14 +38,14 @@ public class PlanQuarterController extends BaseController {
     @ApiOperation(value = "查询季度计划")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
-        PageInfo<PlanQuarter> page = quarterService.selectPlanQuarterList(quarterStandardVo);
+        Page page = quarterService.selectPlanQuarterList(quarterStandardVo);
         return AjaxResult.success(page);
     }
 
     @ApiOperation(value = "审核单位查询季度计划")
     @PostMapping("/examineList")
     public AjaxResult examineList(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
-        PageInfo<PlanQuarter> page = quarterService.selectPlanQuarterExamineList(quarterStandardVo);
+        Page page = quarterService.selectPlanQuarterExamineList(quarterStandardVo);
         return AjaxResult.success(page);
     }
 

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

@@ -1,6 +1,6 @@
 package com.ozs.web.controller.plan;
 
-import com.github.pagehelper.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
@@ -39,14 +39,14 @@ public class PlanYearsController extends BaseController {
     @PostMapping("/list")
     public AjaxResult list(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         //List<PlanYears> list = planYearsService.selectPlanYearsList(yearsStandardVo);
-        PageInfo<PlanYears> page = planYearsService.selectPlanYearsList(yearsStandardVo);
+        Page page = planYearsService.selectPlanYearsList(yearsStandardVo);
         return AjaxResult.success(page);
     }
 
     @ApiOperation(value = "审核单位查询年度计划")
     @PostMapping("/examineList")
     public AjaxResult examineList(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        PageInfo<PlanYears> page = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
+        Page page = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
         return AjaxResult.success(page);
     }
 

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

@@ -59,7 +59,7 @@ public class ProvisionalPlanController extends BaseController {
     public AjaxResult insertProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan, HttpServletRequest request) {
         //获取采购单位
         LoginUser loginUser = tokenService.getLoginUser(request);
-        provisionalPlan.setPurchaseDeptId(loginUser.getDeptId());
+        provisionalPlan.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
         provisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
         provisionalPlan.setCreateTime(new Date());
         // planType计划类型（0：季度计划，1：临时计划）
@@ -84,7 +84,7 @@ public class ProvisionalPlanController extends BaseController {
     @PostMapping("/updateProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('base:provisionalPlan:updateProvisionalPlan')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.UPDATE)
-    public AjaxResult updateProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan) {
+    public AjaxResult updateProvisionalPlan(@RequestBody ProvisionalPlanVo provisionalPlan) {
         if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanPracticalId())) {
             return error("临时计划id和修改数据不能为空");
         }

purchase-common/src/main/java/com/ozs/common/utils/PageUtils.java

@@ -1,22 +1,24 @@
 package com.ozs.common.utils;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.page.PageDomain;
 import com.ozs.common.core.page.TableSupport;
 import com.ozs.common.utils.sql.SqlUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 分页工具类
  *
  * @author ruoyi
  */
-public class PageUtils extends PageHelper
-{
+public class PageUtils extends PageHelper {
     /**
      * 设置请求分页数据
      */
-    public static void startPage()
-    {
+    public static void startPage() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
@@ -28,8 +30,48 @@ public class PageUtils extends PageHelper
     /**
      * 清理分页的线程变量
      */
-    public static void clearPage()
-    {
+    public static void clearPage() {
         PageHelper.clearPage();
     }
+
+    /**
+     * 分页函数
+     *
+     * @param currentPage 当前页数
+     * @param pageSize    每一页的数据条数
+     * @param list        要进行分页的数据列表
+     * @return 当前页要展示的数据
+     * @author pochettino
+     */
+    public static Page getPages(Integer currentPage, Integer pageSize, List list) {
+        Page page = new Page();
+        if (list == null) {
+            return null;
+        }
+        int size = list.size();
+
+        if (pageSize > size) {
+            pageSize = size;
+        }
+        if (pageSize != 0) {
+            // 求出最大页数，防止currentPage越界
+            int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1;
+
+            if (currentPage > maxPage) {
+                currentPage = maxPage;
+            }
+        }
+        // 当前页第一条数据的下标
+        int curIdx = currentPage > 1 ? (currentPage - 1) * pageSize : 0;
+
+        List pageList = new ArrayList();
+
+        // 将当前页的数据放进pageList
+        for (int i = 0; i < pageSize && curIdx + i < size; i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+
+        page.setCurrent(currentPage).setSize(pageSize).setTotal(list.size()).setRecords(pageList);
+        return page;
+    }
 }

purchase-system/src/main/java/com/ozs/base/domain/BaseExpert.java

@@ -2,6 +2,7 @@ package com.ozs.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.base.domain.vo.BaseExpertVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,6 +43,7 @@ public class BaseExpert {
     /**
      * 出生年月
      */
+    @JsonFormat(pattern = "yyyy-MM")
     @ApiModelProperty(value = "出生年月")
     @TableField("expert_date_birth")
     private String expertDateBirth;
@@ -94,4 +96,18 @@ public class BaseExpert {
     @ApiModelProperty(value = "状态 黑白名单")
     @TableField("status")
     private String status;
+
+    /**
+     * 所在区域
+     */
+    @ApiModelProperty(value = "所在区域")
+    @TableField("local_area")
+    private String localArea;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    @TableField("id_number")
+    private String idNumber;
 }

purchase-system/src/main/java/com/ozs/base/domain/BaseUnitInformation.java

@@ -0,0 +1,44 @@
+package com.ozs.base.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : sunhh
+ * @create 2023/2/2 17:59
+ */
+@Data
+@TableName("base_unit_information")
+public class BaseUnitInformation {
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "id")
+    @TableField("id")
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "单位名称")
+    @TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    @TableField("created")
+    private String created;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+}

purchase-system/src/main/java/com/ozs/base/domain/vo/BaseExpertVo.java

@@ -1,18 +1,89 @@
 package com.ozs.base.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class BaseExpertVo extends PageVo {
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-    @ApiModelProperty("专家姓名")
-    private String expertNameVo;
-    @ApiModelProperty("专业类型")
-    private String majorTypeVo;
-    @ApiModelProperty("专业等级")
-    private String majorGradeVo;
-    @ApiModelProperty("采购品种")
-    private String varietyPurchaseVo;
+    /**
+     * 专家名称
+     */
+    @ApiModelProperty(value = "专家名称")
+    private String expertName;
+
+    /**
+     * 专家性别
+     */
+    @ApiModelProperty(value = "专家性别")
+    private String expertGender;
+
+    /**
+     * 出生年月
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+    @ApiModelProperty(value = "出生年月")
+    private String expertDateBirth;
+
+    /**
+     * 联系方式
+     */
+    @ApiModelProperty(value = "联系方式")
+    private String expertTel;
+
+    /**
+     * 专业类型
+     */
+    @ApiModelProperty(value = "专业类型")
+    private String majorType;
+
+    /**
+     * 单位信息
+     */
+    @ApiModelProperty(value = "单位信息")
+    private String unitInformation;
+
+    /**
+     * 专业等级
+     */
+    @ApiModelProperty(value = "专业等级")
+    private String majorGrade;
+
+    /**
+     * 采购品种
+     */
+    @ApiModelProperty(value = "采购品种")
+    private String varietyPurchase;
+
+    /**
+     * 职称
+     */
+    @ApiModelProperty(value = "职称")
+    private String professionalTitle;
+
+    /**
+     * 状态 黑白名单
+     */
+    @ApiModelProperty(value = "状态 黑白名单")
+    private String status;
+
+    /**
+     * 所在区域
+     */
+    @ApiModelProperty(value = "所在区域")
+    private String localArea;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    private String idNumber;
 }

purchase-system/src/main/java/com/ozs/base/mapper/BaseExpertMapper.java

@@ -2,9 +2,17 @@ package com.ozs.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.BaseUnitInformation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface BaseExpertMapper extends BaseMapper<BaseExpert> {
     int insertExpert(BaseExpert baseExpert);
+
+    List<BaseUnitInformation> selectByUnitInformation(@Param("unitInformation") String unitInformation);
+
+    Integer insertBaseUnitInformation(BaseUnitInformation baseUnitInformation);
 }

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

@@ -4,12 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.BaseUnitInformation;
 import com.ozs.base.mapper.BaseExpertMapper;
 import com.ozs.base.mapper.BaseSupplierMapper;
 import com.ozs.base.service.BaseExpertService;
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExpert> implements BaseExpertService {
 
@@ -18,6 +24,18 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
 
     @Override
     public int insertExpert(BaseExpert baseExpert) {
+        // base_unit_information 单位信息表
+        if(StringUtils.isNotNull(baseExpert.getUnitInformation())) {
+            List<BaseUnitInformation> baseUnitInformationList = baseExpertMapper.selectByUnitInformation(baseExpert.getUnitInformation());
+            if (baseUnitInformationList.size() <= 0) {
+                BaseUnitInformation baseUnitInformation = new BaseUnitInformation();
+                baseUnitInformation.setUnitName(baseExpert.getUnitInformation());
+                baseUnitInformation.setCreated(baseExpert.getExpertName());
+                baseUnitInformation.setCreateTime(new Date());
+                Integer i = baseExpertMapper.insertBaseUnitInformation(baseUnitInformation);
+            }
+        }
+
         return baseExpertMapper.insertExpert(baseExpert);
     }
 

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

@@ -28,10 +28,10 @@ public class HomeNotificationMessage extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long homeNotificationMessageId;
 
-    /** 首页分类（0需求单位首页1采购管理部门首页2采购部首页） */
+    /** 首页分类（0需求单位首页1采购部首页） */
     private Integer homepageClassification;
 
-    /** 公消息分类(0预警消息1.发函催告2.预期告警) */
+    /** 公消息分类(0预警消息1.发函催告2.逾期告警) */
     private Integer messageClassification;
     
     /** 项目类型（0：装备类；1：物资类；2：服务类；3：工程类） */

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
     int deleteProvisionalPlanById(@Param("planYearId") Integer planYearId);
 
-    int updateProvisionalPlanById(ProvisionalPlan provisionalPlan);
+    int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan);
 
     List<ProvisionalPlan> selectProjectName(String projectName);
 

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

@@ -1,7 +1,7 @@
 package com.ozs.plan.service;
 
 
-import com.github.pagehelper.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.PlanQuarter;
@@ -23,7 +23,7 @@ public interface PlanQuarterService {
      * @param vo 季度计划请求对象
      * @return 季度计划记录集合
      */
-    public PageInfo<PlanQuarter> selectPlanQuarterList(PlanQuarterStandardVo vo);
+    public Page selectPlanQuarterList(PlanQuarterStandardVo vo);
 
     /**
      * 查询季度计划记录集合--导出
@@ -39,7 +39,7 @@ public interface PlanQuarterService {
      * @param vo 季度计划请求对象
      * @return 季度计划记录集合
      */
-    public PageInfo<PlanQuarter> selectPlanQuarterExamineList(PlanQuarterStandardVo vo);
+    public Page selectPlanQuarterExamineList(PlanQuarterStandardVo vo);
 
     /**
      * 查询季度计划记录集合(审核单位--导出）

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

@@ -1,9 +1,8 @@
 package com.ozs.plan.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
@@ -25,7 +24,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
+    public Page selectPlanYearsList(PlanYearsStandardVo vo);
 
     /**
      * 查询年度计划记录集合--导出
@@ -41,7 +40,7 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public PageInfo<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo);
+    public Page selectPlanYearsExamineList(PlanYearsStandardVo vo);
 
     /**
      * 查询年度计划记录集合(审核单位--导出）
@@ -207,8 +206,9 @@ public interface PlanYearsService extends IService<PlanYears> {
     AjaxResult procurementOfficeWinningTheBidTotal();
 
     /**
-     * 采购办首未中标项目理总数 
+     * 采购办首未中标项目理总数
+     *
      * @return
-     */ 
+     */
     AjaxResult procurementOfficeFailureToWinTheBidTotal();
 }

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

@@ -14,7 +14,7 @@ import java.util.List;
 public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
     int deleteProvisionalPlanById(Integer planYearId);
 
-    int updateProvisionalPlanById(ProvisionalPlan provisionalPlan);
+    int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan);
 
     String importProvisionalPlan(List<ProvisionalPlan> provisionalPlans, boolean updateSupport, LoginUser loginUser);
 

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

@@ -12,6 +12,7 @@ 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.PageUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.plan.doman.PlanQuarter;
@@ -69,11 +70,10 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     private SysFileService fileService;
 
     @Override
-    public PageInfo<PlanQuarter> selectPlanQuarterList(PlanQuarterStandardVo vo) {
+    public Page selectPlanQuarterList(PlanQuarterStandardVo vo) {
         PlanQuarter quarters = new PlanQuarter();
         List<PlanQuarter> planQuarter;
         List<PlanQuarter> planQuarterList = new ArrayList<>();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         try {
             BeanUtils.copyProperties(vo, quarters);
             planQuarter = planQuarterMapper.selectPlanQuarterList(quarters);
@@ -81,8 +81,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanQuarter> pageInfo = new PageInfo<PlanQuarter>(planQuarterList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planQuarterList);
+        return pages;
     }
 
     @Override
@@ -125,9 +125,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     }
 
     @Override
-    public PageInfo<PlanQuarter> selectPlanQuarterExamineList(PlanQuarterStandardVo vo) {
+    public Page selectPlanQuarterExamineList(PlanQuarterStandardVo vo) {
         PlanQuarter quarters = new PlanQuarter();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         List<PlanQuarter> planQuarter;
         List<PlanQuarter> planQuarterList = new ArrayList<>();
         try {
@@ -137,8 +136,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanQuarter> pageInfo = new PageInfo<PlanQuarter>(planQuarterList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planQuarterList);
+        return pages;
     }
 
     @Override
@@ -235,7 +234,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         if (byId == null) {
             return AjaxResult.error("数据查询失败");
         }
-        SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(byId.getPurchaseDeptId()).get("sysDept");
+        SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(byId.getPurchaseDeptId())).get("sysDept");
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", byId.getPlanPracticalId());
@@ -318,7 +317,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(info.getDeptId());
+                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
@@ -412,7 +411,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
-            BeanUtils.copyProperties(vo, ofYears);
+            BeanUtils.copyProperties(byId, ofYears);
             ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
@@ -527,7 +526,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
         HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
         List<PlanQuarter> list = new ArrayList<PlanQuarter>();
         for (PlanQuarter planYear : planQuarter) {
-            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
+            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(planYear.getPurchaseDeptId())).get("sysDept");
             planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
 
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {

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

@@ -2,19 +2,11 @@ package com.ozs.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.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;
@@ -24,6 +16,7 @@ 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.PageUtils;
 import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
@@ -38,18 +31,12 @@ 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;
@@ -66,8 +53,6 @@ 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;
 
 /**
@@ -98,15 +83,13 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Autowired
     private ISysUserService userService;
     @Autowired
-    private SysProcurementStandardMapper sysProcurementStandardMapper;
-    @Autowired
     private PmDemandMapper pmDemandMapper;
+
     @Override
-    public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
+    public Page selectPlanYearsList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         List<PlanYears> planYears;
         List<PlanYears> planYearsList = new ArrayList<>();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         try {
             BeanUtils.copyProperties(vo, ofYears);
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
@@ -114,8 +97,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanYears> pageInfo = new PageInfo<PlanYears>(planYearsList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planYearsList);
+        return pages;
     }
 
     @Override
@@ -158,9 +141,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     }
 
     @Override
-    public PageInfo<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo) {
+    public Page selectPlanYearsExamineList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
-        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         List<PlanYears> planYears;
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
@@ -170,8 +152,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         } catch (Exception e) {
             e.printStackTrace();
         }
-        PageInfo<PlanYears> pageInfo = new PageInfo<PlanYears>(planYearsList);
-        return pageInfo;
+        Page pages = PageUtils.getPages(vo.getPageNum().intValue(), vo.getPageSize().intValue(), planYearsList);
+        return pages;
     }
 
     @Override
@@ -269,7 +251,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (byId == null) {
             return AjaxResult.error("数据查询失败");
         }
-        SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(byId.getPurchaseDeptId()).get("sysDept");
+        SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(byId.getPurchaseDeptId())).get("sysDept");
         byId.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         HashMap<String, Object> map = new HashMap<>();
         map.put("red_id", byId.getPlanYearId());
@@ -353,7 +335,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(info.getDeptId());
+                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
@@ -448,6 +430,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
         PlanQuarter quarters = new PlanQuarter();
         BeanUtils.copyProperties(byId, quarters);
+        quarters.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         planQuarterMapper.insertPlanQuarter(quarters);
         ofYears.setPlanYearId(vo.getPlanYearId());
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
@@ -554,16 +537,16 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
-                        .eq(PlanYears::getIsExcess, IsExcess.NO_EXCESS.getCode()))
+                                .eq(PlanYears::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PlanYears::getPurchaseDeptId, collect)
-                        .eq(PlanYears::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",ProjectStatus.PLANWAIEXAMINE.getCode(),ProjectStatus.PLANTOEXAMINE.getCode());
+                                .eq(PlanYears::getIsExcess, IsExcess.EXCESS.getCode()))
+                        .in("project_status", ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
                 planYears = planYearsMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -583,7 +566,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("purchase_dept_id", sysDept.getDeptId());
-                pmDemands =pmDemandMapper.selectList(queryWrapper);
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -602,7 +585,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -611,7 +594,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(),PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
+                        .in("project_status", PmProjectStatus.DEMAND_WAIT_AUDIT.getCode(), PmProjectStatus.DEMAND_AUDIT_RETURN.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -631,8 +614,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 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);
+                queryWrapper.in("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode(), PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -651,8 +634,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 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);
+                queryWrapper.in("project_status", PmProjectStatus.UNDER_CONSTRUCTION.getCode(), PmProjectStatus.COMPLETION_CONSTRUCTION.getCode());
+                pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -671,7 +654,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -680,7 +663,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
+                        .in("project_status", PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
                                 PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
                                 PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
                                 PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
@@ -707,7 +690,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -743,7 +726,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -752,7 +735,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .lt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .lt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -772,7 +755,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
                 List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-                if (collect.size()==0){
+                if (collect.size() == 0) {
                     collect.add(-1L);
                 }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
@@ -781,7 +764,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .gt("project_status",PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .gt("project_status", PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -826,7 +809,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
         List<PlanYears> list = new ArrayList<PlanYears>();
         for (PlanYears planYear : planYears) {
-            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(planYear.getPurchaseDeptId()).get("sysDept");
+            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(planYear.getPurchaseDeptId())).get("sysDept");
             planYear.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
 
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {

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

@@ -59,7 +59,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     }
 
     @Override
-    public int updateProvisionalPlanById(ProvisionalPlan provisionalPlan) {
+    public int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan) {
         return provisionalPlanMapper.updateProvisionalPlanById(provisionalPlan);
     }
 
@@ -86,7 +86,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofProvisionalPlan.getPurchaseDeptName());
                     if (StringUtils.isNotNull(info)) {
-                        ofProvisionalPlan.setPurchaseDeptId(info.getDeptId());
+                        ofProvisionalPlan.setPurchaseDeptId(String.valueOf(info.getDeptId()));
                     }
                     ofProvisionalPlan.setProjectType(projectTypesMap.get(ofProvisionalPlan.getProjectType()));
                     ofProvisionalPlan.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
@@ -274,7 +274,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
         HashMap<String, String> purchaseServices = planEnums.get("purchaseServices");
         if (provisionalPlan.getPurchaseDeptId() != null) {
-            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(provisionalPlan.getPurchaseDeptId()).get("sysDept");
+            SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(provisionalPlan.getPurchaseDeptId())).get("sysDept");
             provisionalPlan.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
         }
         for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {
@@ -329,7 +329,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         List<ProvisionalPlan> list = new ArrayList<ProvisionalPlan>();
         for (ProvisionalPlan provisionalPlan : provisionalPlans) {
             if (provisionalPlan.getPurchaseDeptId() != null) {
-                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(provisionalPlan.getPurchaseDeptId()).get("sysDept");
+                SysDeptResponseVo sysDeptResponseVo = (SysDeptResponseVo) deptService.selectDeptById(Long.valueOf(provisionalPlan.getPurchaseDeptId())).get("sysDept");
                 provisionalPlan.setPurchaseDeptName(sysDeptResponseVo.getDeptName());
             }
             for (Map.Entry<String, String> entry : projectTypesMap.entrySet()) {

purchase-system/src/main/resources/mapper/base/BaseExpertMapper.xml

@@ -15,6 +15,8 @@
         <result property="varietyPurchase" column="variety_purchase"/>
         <result property="professionalTitle" column="professional_title"/>
         <result property="status" column="status"/>
+        <result property="localArea" column="local_area"/>
+        <result property="idNumber" column="id_number"/>
     </resultMap>
 
     <insert id="insertExpert" parameterType="com.ozs.base.domain.BaseExpert">
@@ -47,7 +49,13 @@
             professional_title,
         </if>
         <if test="status != null and status != ''">
-            status
+            status,
+        </if>
+        <if test="localArea != null and localArea != ''">
+            local_area,
+        </if>
+        <if test="idNumber != null and idNumber != ''">
+            id_number
         </if>
         ) values (
         <if test="expertName != null and expertName != ''">
@@ -78,9 +86,48 @@
             #{professionalTitle},
         </if>
         <if test="status != null and status != ''">
-            #{status}
+            #{status},
+        </if>
+        <if test="localArea != null and localArea != ''">
+            #{localArea},
+        </if>
+        <if test="idNumber != null and idNumber != ''">
+            #{idNumber}
         </if>
         )
     </insert>
 
+    <select id="selectByUnitInformation" parameterType="java.lang.String"
+            resultType="com.ozs.base.domain.BaseUnitInformation">
+        select * from base_unit_information
+        <where>
+            <if test="unitInformation != null and unitInformation != ''">
+                unit_name = #{unitInformation}
+            </if>
+        </where>
+    </select>
+
+    <insert id="insertBaseUnitInformation" parameterType="com.ozs.base.domain.BaseUnitInformation">
+        insert into base_unit_information (
+        <if test="unitName != null and unitName != '' ">
+            unit_name,
+        </if>
+        <if test="created != null and created != '' ">
+            created,
+        </if>
+        <if test="createTime != null">
+            create_time
+        </if>
+        ) values (
+        <if test="unitName != null and unitName != ''">
+            #{unitName},
+        </if>
+        <if test="created != null and created != ''">
+            #{created},
+        </if>
+        <if test="createTime != null">
+            #{createTime}
+        </if>
+        )
+    </insert>
 </mapper>

purchase-system/src/main/resources/mapper/base/BaseSupplierMapper.xml

@@ -11,6 +11,16 @@
         <result property="supplierType" column="supplier_type"/>
         <result property="supplierState" column="supplier_state"/>
         <result property="supplierAdvancePurchase" column="supplier_advance_purchase"/>
+        <result property="postalCode" column="postal_code"/>
+        <result property="projectPerson" column="project_person"/>
+        <result property="telephone" column="telephone"/>
+        <result property="bankAccountName" column="bank_account_name"/>
+        <result property="bankOfDeposit" column="bank_of_deposit"/>
+        <result property="bankAccountNumber" column="bank_account_number"/>
+        <result property="created" column="created"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updated" column="updated"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <insert id="insertBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier">
@@ -31,7 +41,37 @@
             supplier_state,
         </if>
         <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">
-            supplier_advance_purchase
+            supplier_advance_purchase,
+        </if>
+        <if test="postalCode != null and postalCode != ''">
+            postal_code,
+        </if>
+        <if test="projectPerson != null and projectPerson != ''">
+            project_person,
+        </if>
+        <if test="telephone != null and telephone != ''">
+            telephone,
+        </if>
+        <if test="bankAccountName != null and bankAccountName != ''">
+            bank_account_name,
+        </if>
+        <if test="bankOfDeposit != null and bankOfDeposit != ''">
+            bank_of_deposit,
+        </if>
+        <if test="bankAccountNumber != null and bankAccountNumber != ''">
+            bank_account_number,
+        </if>
+        <if test="created != null and created != ''">
+            created,
+        </if>
+        <if test="createTime != null and createTime != ''">
+            create_time,
+        </if>
+        <if test="updated != null and updated != ''">
+            updated,
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            update_time
         </if>
         ) values (
         <if test="supplierName != null and supplierName != ''">
@@ -50,13 +90,45 @@
             #{supplierState},
         </if>
         <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">
-            #{supplierAdvancePurchase}
+            #{supplierAdvancePurchase},
+        </if>
+        <if test="postalCode != null and postalCode != ''">
+            #{postalCode},
+        </if>
+        <if test="projectPerson != null and projectPerson != ''">
+            #{projectPerson},
+        </if>
+        <if test="telephone != null and telephone != ''">
+            #{telephone},
+        </if>
+        <if test="bankAccountName != null and bankAccountName != ''">
+            #{bankAccountName},
+        </if>
+        <if test="bankOfDeposit != null and bankOfDeposit != ''">
+            #{bankOfDeposit},
+        </if>
+        <if test="bankAccountNumber != null and bankAccountNumber != ''">
+            #{bankAccountNumber},
+        </if>
+        <if test="created != null and created != ''">
+            #{created},
+        </if>
+        <if test="createTime != null and createTime != ''">
+            #{createTime},
+        </if>
+        <if test="updated != null and updated != ''">
+            #{updated},
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            #{updateTime}
         </if>
         )
     </insert>
 
     <delete id="deleteBaseSupplier" parameterType="java.lang.Integer">
-        delete from base_supplier where id = #{id}
+        delete
+        from base_supplier
+        where id = #{id}
     </delete>
 
     <update id="updateBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier">
@@ -80,6 +152,36 @@
             <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != '' ">
                 supplier_advance_purchase = #{supplierAdvancePurchase},
             </if>
+            <if test="postalCode != null and postalCode != ''">
+                postal_code = #{postalCode},
+            </if>
+            <if test="projectPerson != null and projectPerson != ''">
+                project_person = #{projectPerson},
+            </if>
+            <if test="telephone != null and telephone != ''">
+                telephone = #{telephone},
+            </if>
+            <if test="bankAccountName != null and bankAccountName != ''">
+                bank_account_name = #{bankAccountName},
+            </if>
+            <if test="bankOfDeposit != null and bankOfDeposit != ''">
+                bank_of_deposit = #{bankOfDeposit},
+            </if>
+            <if test="bankAccountNumber != null and bankAccountNumber != ''">
+                bank_account_number = #{bankAccountNumber},
+            </if>
+            <if test="created != null and created != ''">
+                created = #{created},
+            </if>
+            <if test="createTime != null and createTime != ''">
+                create_time = #{createTime},
+            </if>
+            <if test="updated != null and updated != ''">
+                updated = #{updated},
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -106,7 +208,37 @@
                 supplier_state = #{supplierState},
             </if>
             <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != '' ">
-                supplier_advance_purchase = #{supplierAdvancePurchase}
+                supplier_advance_purchase = #{supplierAdvancePurchase},
+            </if>
+            <if test="postalCode != null and postalCode != ''">
+                postal_code = #{postalCode},
+            </if>
+            <if test="projectPerson != null and projectPerson != ''">
+                project_person = #{projectPerson},
+            </if>
+            <if test="telephone != null and telephone != ''">
+                telephone = #{telephone},
+            </if>
+            <if test="bankAccountName != null and bankAccountName != ''">
+                bank_account_name = #{bankAccountName},
+            </if>
+            <if test="bankOfDeposit != null and bankOfDeposit != ''">
+                bank_of_deposit = #{bankOfDeposit},
+            </if>
+            <if test="bankAccountNumber != null and bankAccountNumber != ''">
+                bank_account_number = #{bankAccountNumber},
+            </if>
+            <if test="created != null and created != ''">
+                created = #{created},
+            </if>
+            <if test="createTime != null and createTime != ''">
+                create_time = #{createTime},
+            </if>
+            <if test="updated != null and updated != ''">
+                updated = #{updated},
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime}
             </if>
         </where>
     </select>

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

@@ -37,7 +37,7 @@
         where planPracticalId = #{plan_practical_id}
     </delete>
 
-    <update id="updateProvisionalPlanById" parameterType="com.ozs.plan.doman.ProvisionalPlan">
+    <update id="updateProvisionalPlanById" parameterType="com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo">
         update plan_practical
         <set>
             <if test="purchaseDeptId != null and purchaseDeptId != ''">
@@ -64,13 +64,13 @@
             <if test="purchaseMode != null and purchaseMode != '' ">
                 purchase_mode = #{purchaseMode},
             </if>
-            <if test="planDemandSubTime != null and planDemandSubTime != '' ">
+            <if test="planDemandSubTime != null">
                 plan_demand_sub_time = #{planDemandSubTime},
             </if>
-            <if test="planPurchaseFinishTime != null and planPurchaseFinishTime != '' ">
+            <if test="planPurchaseFinishTime != null">
                 plan_purchase_finish_time = #{planPurchaseFinishTime},
             </if>
-            <if test="planDeliverTime != null and planDeliverTime != '' ">
+            <if test="planDeliverTime != null">
                 plan_deliver_time = #{planDeliverTime},
             </if>
             <if test="projectAttr != null and projectAttr != '' ">
@@ -97,11 +97,11 @@
             <if test="updated != null and updated != '' ">
                 updated = #{updated},
             </if>
-            <if test="updateTime != null and updateTime != '' ">
+            <if test="updateTime != null">
                 update_time = #{updateTime}
             </if>
         </set>
-        where planPracticalId = #{plan_practical_id}
+        where plan_practical_id = #{planPracticalId}
     </update>
 
     <select id="selectProjectName" resultType="com.ozs.plan.doman.ProvisionalPlan" parameterType="java.lang.String">
@@ -116,14 +116,14 @@
         update plan_practical
         set project_status = 1
         where plan_type = 1
-          and plan_practical_id = #{plan_practical_id}
+          and plan_practical_id = #{planPracticalId}
     </update>
 
     <select id="seletById" resultType="com.ozs.plan.doman.ProvisionalPlan" parameterType="java.lang.Integer">
         select *
         from plan_practical
         where plan_type = 1
-          and plan_practical_id = #{plan_practical_id}
+          and plan_practical_id = #{planPracticalId}
     </select>
 
     <select id="selectProvisionalPlan" resultType="com.ozs.plan.doman.ProvisionalPlan"