Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

 Conflicts:

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

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.Date;
 
 /**
  * 专家库管理
@@ -46,6 +47,10 @@ public class BaseExpertController extends BaseController {
         if (StringUtils.isNull(baseExpert) || StringUtils.isNull(baseExpert.getExpertName())) {
             return error("专家库名称不能为空");
         }
+        baseExpert.setCreated(getUserId().toString());
+        baseExpert.setCreateTime(new Date());
+        baseExpert.setUpdated(baseExpert.getCreated());
+        baseExpert.setUpdateTime(baseExpert.getCreateTime());
         return toAjax(baseExpertService.insertExpert(baseExpert));
     }
 
@@ -64,6 +69,9 @@ public class BaseExpertController extends BaseController {
         if (StringUtils.isNull(baseExpert) || StringUtils.isNull(baseExpert.getId())) {
             return error("专家库id和修改数据不能为空");
         }
+
+        baseExpert.setUpdated(getUserId().toString());
+        baseExpert.setUpdateTime(new Date());
         return toAjax(baseExpertService.updateById(baseExpert));
     }
 

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmContractInfoController.java

@@ -4,18 +4,32 @@ package com.ozs.web.controller.pm;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.PmProjectStatus;
+import com.ozs.common.enums.SysFileRefEnum;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.framework.web.service.TokenService;
+import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.doman.PmProjectConstruction;
+import com.ozs.pm.doman.vo.requestVo.PmContractInfoReqVo;
 import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
+import com.ozs.pm.doman.vo.requestVo.PmProjectConstructionReqVo;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
 import com.ozs.pm.service.IPmDemandService;
+import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+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.validation.constraints.NotEmpty;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 合同信息Controller
  *
@@ -39,4 +53,33 @@ public class PmContractInfoController extends BaseController {
         IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,4);
         return success(page);
     }
+
+    @ApiOperation(value = "合同信息填制",notes = "采购需求ID和上传附件必传")
+    @PostMapping("/insertContractInfo")
+    public AjaxResult insertContractInfo(@NotEmpty(message = "数据为空") @RequestBody PmContractInfoReqVo pmContractInfoReqVo) {
+        try {
+            pmContractInfoReqVo.setCreateBy(getUserId().toString());
+            pmContractInfoReqVo.setCreateTime(new Date());
+            pmContractInfoReqVo.setUpdateBy(getUserId().toString());
+            pmContractInfoReqVo.setUpdateTime(pmContractInfoReqVo.getCreateTime());
+            return toAjax(pmDemandService.insertContractInfo(pmContractInfoReqVo));
+        } catch (Exception e){
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 查看详情
+     */
+    @ApiOperation(value = "查看详情", notes = "必传demandId和详情类型(1项目计划，2需求建档，3任务下达,4中标信息，5合同信息，6建设情况),其他字段不传")
+    @PostMapping("/view")
+    public AjaxResult view(@RequestBody PmDemandReqVo pmDemandReqVo) {
+        if(pmDemandReqVo.getDemandId() == null){
+            return AjaxResult.error("demandId不能为空");
+        }
+        if(StringUtils.isEmpty(pmDemandReqVo.getDetailType())){
+            return AjaxResult.error("详情的类型不能为空");
+        }
+        return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
+    }
 }

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmProjectConstructionController.java

@@ -4,18 +4,31 @@ package com.ozs.web.controller.pm;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.framework.web.service.TokenService;
+import com.ozs.common.enums.PmProjectStatus;
+import com.ozs.common.enums.SysFileRefEnum;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.doman.PmProjectConstruction;
 import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
+import com.ozs.pm.doman.vo.requestVo.PmProjectConstructionReqVo;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
 import com.ozs.pm.service.IPmDemandService;
+import com.ozs.pm.service.PmProjectConstructionService;
+import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+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.validation.constraints.NotEmpty;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 项目建设Controller
  *
@@ -29,7 +42,7 @@ public class PmProjectConstructionController extends BaseController {
     @Autowired
     private IPmDemandService pmDemandService;
     @Autowired
-    private TokenService tokenService;
+    private PmProjectConstructionService pmProjectConstructionService;
 
     /**
      * 项目建设查询列表
@@ -40,4 +53,33 @@ public class PmProjectConstructionController extends BaseController {
         IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,5);
         return success(page);
     }
+
+    @ApiOperation(value = "建设文档填制",notes = "采购需求ID和上传附件必传")
+    @PostMapping("/insertProjectConstruction")
+    public AjaxResult insertProjectConstruction(@NotEmpty(message = "数据为空") @RequestBody PmProjectConstructionReqVo pmProjectConstructionReqVo) {
+        try {
+            pmProjectConstructionReqVo.setCreateBy(getUserId().toString());
+            pmProjectConstructionReqVo.setCreateTime(new Date());
+            pmProjectConstructionReqVo.setUpdateBy(getUserId().toString());
+            pmProjectConstructionReqVo.setUpdateTime(pmProjectConstructionReqVo.getCreateTime());
+            return toAjax(pmDemandService.insertProjectConstruction(pmProjectConstructionReqVo));
+        } catch (Exception e){
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 查看详情
+     */
+    @ApiOperation(value = "查看详情", notes = "必传demandId和详情类型(1项目计划，2需求建档，3任务下达,4中标信息，5合同信息，6建设情况),其他字段不传")
+    @PostMapping("/view")
+    public AjaxResult view(@RequestBody PmDemandReqVo pmDemandReqVo) {
+        if(pmDemandReqVo.getDemandId() == null){
+            return AjaxResult.error("demandId不能为空");
+        }
+        if(StringUtils.isEmpty(pmDemandReqVo.getDetailType())){
+            return AjaxResult.error("详情的类型不能为空");
+        }
+        return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
+    }
 }

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -3,10 +3,8 @@ package com.ozs.web.controller.pm;
 
 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.base.domain.BaseAgency;
 import com.ozs.base.domain.BaseExpert;
-import com.ozs.base.domain.vo.BaseExpertVo;
 import com.ozs.base.service.BaseAgencyService;
 import com.ozs.base.service.BaseExpertService;
 import com.ozs.common.annotation.Log;
@@ -15,17 +13,16 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.enums.NameListType;
+import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.SysFileRefEnum;
+import com.ozs.common.utils.RandomUtil;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.pm.doman.PmBidWinning;
 import com.ozs.pm.doman.PmDemand;
-import com.ozs.pm.doman.PmReleaseAnnouncement;
-import com.ozs.pm.doman.vo.requestVo.PmBaseExpertReqVo;
-import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
-import com.ozs.pm.doman.vo.requestVo.PmPurchaseExecutionReqVo;
-import com.ozs.pm.doman.vo.requestVo.PmReleaseAnnouncementReqVo;
+import com.ozs.pm.doman.vo.requestVo.*;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
 import com.ozs.pm.service.IPmDemandService;
-import com.ozs.pm.service.PmReleaseAnnouncementService;
+import com.ozs.pm.service.PmBidWinningService;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -57,6 +55,7 @@ public class PmPurchaseExecutionController extends BaseController {
     @Autowired
     private BaseExpertService baseExpertService;
 
+
     /**
      * 采购执行查询列表
      */
@@ -105,6 +104,7 @@ public class PmPurchaseExecutionController extends BaseController {
         }
         PmDemand pmDemandUpdate = new PmDemand();
         pmDemandUpdate.setDemandId(demandId);
+        pmDemandUpdate.setProjectStatus(Long.parseLong(PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode()));
         pmDemandUpdate.setAgencyId(agencyId);
         pmDemandUpdate.setExtractAgencyTime(new Date());
         pmDemandUpdate.setUpdateTime(pmDemandUpdate.getExtractAgencyTime());
@@ -127,13 +127,17 @@ public class PmPurchaseExecutionController extends BaseController {
         LambdaQueryWrapper<BaseAgency> lw = new LambdaQueryWrapper<>();
         lw.eq(BaseAgency::getCompanyType,pmDemand.getProjectType());
         lw.eq(BaseAgency::getStatus,0);
-        Optional<BaseAgency> any = baseAgencyService.list(lw).stream().findAny();
-        if(ObjectUtils.isEmpty(any)){
+        List<BaseAgency> baseAgencyList = baseAgencyService.list(lw);
+        if (ObjectUtils.isEmpty(baseAgencyList)){
             return error("没有符合的招标代理机构，抽取失败！");
         }
+
+        BaseAgency any = (BaseAgency)(RandomUtil.getRandomList(baseAgencyList,1).get(0));
+
         PmDemand pmDemandUpdate = new PmDemand();
         pmDemandUpdate.setDemandId(demandId);
-        pmDemandUpdate.setAgencyId(any.get().getId());
+        pmDemandUpdate.setProjectStatus(Long.parseLong(PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode()));
+        pmDemandUpdate.setAgencyId(any.getId());
         pmDemandUpdate.setExtractAgencyTime(new Date());
         pmDemandUpdate.setUpdateTime(pmDemandUpdate.getExtractAgencyTime());
         pmDemandUpdate.setUpdateBy(getUserId().toString());
@@ -141,8 +145,8 @@ public class PmPurchaseExecutionController extends BaseController {
     }
 
     @ApiOperation(value = "上传招标文件",notes = "采购需求ID和上传附件必传")
-    @PostMapping("/upLoadBidFile")
-    public AjaxResult upLoadBidFile(@NotEmpty(message = "数据为空") @RequestBody PmPurchaseExecutionReqVo pmPurchaseExecutionReqVo) {
+    @PostMapping("/uploadBidFile")
+    public AjaxResult uploadBidFile(@NotEmpty(message = "数据为空") @RequestBody PmPurchaseExecutionReqVo pmPurchaseExecutionReqVo) {
         Long demandId = pmPurchaseExecutionReqVo.getDemandId();
         if(ObjectUtils.isEmpty(demandId)){
             return error("参数错误");
@@ -158,9 +162,14 @@ public class PmPurchaseExecutionController extends BaseController {
             return error("参数错误");
         }
         if (pmDemandService.uploadFile(demandId, SysFileRefEnum.PM_BID_FILE.getType(),sysFileRefs,getUserId().toString())) {
-            return AjaxResult.success();
+            PmDemand pmDemandUpdate = new PmDemand();
+            pmDemandUpdate.setDemandId(demandId);
+            pmDemandUpdate.setProjectStatus(Long.parseLong(PmProjectStatus.WAIT_ANNOUNCEMENT.getCode()));
+            pmDemandUpdate.setUpdateTime(new Date());
+            pmDemandUpdate.setUpdateBy(getUserId().toString());
+            return success(pmDemandService.updateById(pmDemandUpdate));
         } else {
-            return error("上传失败");
+            return error("保存上传附件失败");
         }
     }
 
@@ -168,11 +177,20 @@ public class PmPurchaseExecutionController extends BaseController {
     @PostMapping("/insertPmReleaseAnnouncement")
     public AjaxResult insertPmReleaseAnnouncement(@NotEmpty(message = "数据为空")
                                        @RequestBody PmReleaseAnnouncementReqVo pmReleaseAnnouncementReqVo) {
-        pmReleaseAnnouncementReqVo.setCreateBy(getUserId().toString());
-        pmReleaseAnnouncementReqVo.setCreateTime(new Date());
-        pmReleaseAnnouncementReqVo.setUpdateBy(pmReleaseAnnouncementReqVo.getCreateBy());
-        pmReleaseAnnouncementReqVo.setUpdateTime(pmReleaseAnnouncementReqVo.getCreateTime());
-        return toAjax(pmDemandService.insertPmReleaseAnnouncement(pmReleaseAnnouncementReqVo));
+        try {
+            Long demandId = pmReleaseAnnouncementReqVo.getDemandId();
+            if(ObjectUtils.isEmpty(demandId)){
+                return error("参数错误");
+            }
+            pmReleaseAnnouncementReqVo.setCreateBy(getUserId().toString());
+            pmReleaseAnnouncementReqVo.setCreateTime(new Date());
+            pmReleaseAnnouncementReqVo.setUpdateBy(pmReleaseAnnouncementReqVo.getCreateBy());
+            pmReleaseAnnouncementReqVo.setUpdateTime(pmReleaseAnnouncementReqVo.getCreateTime());
+            return toAjax(pmDemandService.insertPmReleaseAnnouncement(pmReleaseAnnouncementReqVo));
+        }  catch (Exception e) {
+            return error(e.getMessage());
+        }
+
     }
 
     @ApiOperation(value = "获取专家身份证号列表")
@@ -187,8 +205,14 @@ public class PmPurchaseExecutionController extends BaseController {
         LambdaQueryWrapper<BaseExpert> lw = new LambdaQueryWrapper<BaseExpert>();
         lw.eq(BaseExpert::getVarietyPurchase,pmDemand.getProjectType())
                 .eq(BaseExpert::getStatus,NameListType.WHITE.getCode());
-        BaseExpert baseExpert = baseExpertService.getOne(lw);
-        return success(baseExpert);
+        List<BaseExpert> baseExpertList = baseExpertService.list(lw);
+        List<String> idNumberList = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(baseExpertList)) {
+            for(BaseExpert baseExpert :baseExpertList ){
+                idNumberList.add(baseExpert.getIdNumber());
+            }
+        }
+        return success(idNumberList);
     }
 
     @ApiOperation(value = "根据身份证号查询专家", notes = "必传 查询条件：身份证号")
@@ -221,15 +245,190 @@ public class PmPurchaseExecutionController extends BaseController {
     @PostMapping("/insertExpertBatch")
     @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:insertExpertBatch')")
     @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.INSERT)
-    public AjaxResult insertExpertBatch(@RequestBody PmBaseExpertReqVo pmBaseExpertReqVo) {
-        if (ObjectUtils.isEmpty(pmBaseExpertReqVo) || ObjectUtils.isEmpty(pmBaseExpertReqVo.getDemandId()) || ObjectUtils.isEmpty(pmBaseExpertReqVo.getBaseExpertList())) {
-            return error("参数错误");
+    public AjaxResult insertExpertBatch(@NotEmpty(message = "参数不能为空") @RequestBody PmBaseExpertFillReqVo pmBaseExpertFillReqVo) {
+
+        try {
+            if (ObjectUtils.isEmpty(pmBaseExpertFillReqVo)
+                    || ObjectUtils.isEmpty(pmBaseExpertFillReqVo.getDemandId())
+                    || ObjectUtils.isEmpty(pmBaseExpertFillReqVo.getAccessTime())
+                    || ObjectUtils.isEmpty(pmBaseExpertFillReqVo.getBaseExpertList())) {
+                return error("参数错误");
+            }
+            pmBaseExpertFillReqVo.setCreateBy(getUserId().toString());
+            pmBaseExpertFillReqVo.setUpdateBy(pmBaseExpertFillReqVo.getCreateBy());
+
+            return toAjax(pmDemandService.insertExpertBatch(pmBaseExpertFillReqVo));
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 抽取专家
+     */
+    @ApiOperation(value = "抽取专家",notes = "采购需求ID必传")
+    @PostMapping("/extractExpertBatch")
+    public AjaxResult extractExpertBatch(@NotEmpty(message = "参数不能为空")
+                                             @RequestBody PmBaseExpertExtractReqVo pmBaseExpertExtractReqVo) {
+
+        try {
+            if (ObjectUtils.isEmpty(pmBaseExpertExtractReqVo)
+                    || ObjectUtils.isEmpty(pmBaseExpertExtractReqVo.getDemandId())
+                    || ObjectUtils.isEmpty(pmBaseExpertExtractReqVo.getAccessTime())) {
+                return error("参数错误");
+            }
+            return toAjax(pmDemandService.extractExpertBatch(pmBaseExpertExtractReqVo));
+        } catch (Exception e) {
+            return error(e.getMessage());
         }
+    }
+
+    @ApiOperation(value = "填写开标信息",notes = "采购需求ID必传")
+    @PostMapping("/insertBidOpeningBatch")
+    public AjaxResult insertBidOpeningBatch(@NotEmpty(message = "数据为空")
+                                                  @RequestBody PmBidOpeningFillReqVo pmBidOpeningFillReqVo) {
+
         try {
-            return toAjax(pmDemandService.insertExpertBatch(pmBaseExpertReqVo));
+            if (ObjectUtils.isEmpty(pmBidOpeningFillReqVo)
+                    || ObjectUtils.isEmpty(pmBidOpeningFillReqVo.getDemandId())
+                    || ObjectUtils.isEmpty(pmBidOpeningFillReqVo.getPmBidOpeningList())) {
+                return error("参数错误");
+            }
+            pmBidOpeningFillReqVo.setCreateBy(getUserId().toString());
+            pmBidOpeningFillReqVo.setUpdateBy(getUserId().toString());
+            return toAjax(pmDemandService.insertBidOpeningBatch(pmBidOpeningFillReqVo));
         } catch (Exception e) {
             return error(e.getMessage());
         }
+    }
+
+    @ApiOperation(value = "中标情况填制",notes = "采购需求ID必传")
+    @PostMapping("/insertPmBidWinning")
+    public AjaxResult insertPmBidWinning(@NotEmpty(message = "数据为空")
+                                                  @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
+      try {
+          Long demandId = pmBidWinningReqVo.getDemandId();
+          if(ObjectUtils.isEmpty(demandId)){
+              return error("采购需求ID不能为空");
+          }
+          pmBidWinningReqVo.setCreateBy(getUserId().toString());
+          pmBidWinningReqVo.setCreateTime(new Date());
+          pmBidWinningReqVo.setUpdateBy(pmBidWinningReqVo.getCreateBy());
+          pmBidWinningReqVo.setUpdateTime(pmBidWinningReqVo.getCreateTime());
+          return toAjax(pmDemandService.insertPmBidWinning(pmBidWinningReqVo));
+      }  catch (Exception e) {
+          return error(e.getMessage());
+      }
+    }
+
+    @ApiOperation(value = "更换中标人",notes = "采购需求ID必传")
+    @PostMapping("/updatePmBidWinning")
+    public AjaxResult updatePmBidWinning(@NotEmpty(message = "数据为空")
+                                         @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
+        try {
+            Long demandId = pmBidWinningReqVo.getDemandId();
+            if(ObjectUtils.isEmpty(demandId)){
+                return error("采购需求ID不能为空");
+            }
+            pmBidWinningReqVo.setUpdateBy(getUserId().toString());
+            pmBidWinningReqVo.setUpdateTime(new Date());
+            return toAjax(pmDemandService.updatePmBidWinning(pmBidWinningReqVo));
+        }  catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "流标情况填制",notes = "采购需求ID必传")
+    @PostMapping("/insertPmBidFailure")
+    public AjaxResult insertPmBidFailure(@NotEmpty(message = "数据为空")
+                                         @RequestBody PmBidFailureReqVo pmBidFailureReqVo) {
+        try {
+            Long demandId = pmBidFailureReqVo.getDemandId();
+            if(ObjectUtils.isEmpty(demandId)){
+                return error("参数错误");
+            }
+            pmBidFailureReqVo.setCreateBy(getUserId().toString());
+            pmBidFailureReqVo.setCreateTime(new Date());
+            pmBidFailureReqVo.setUpdateBy(pmBidFailureReqVo.getCreateBy());
+            pmBidFailureReqVo.setUpdateTime(pmBidFailureReqVo.getCreateTime());
+            return toAjax(pmDemandService.insertPmBidFailure(pmBidFailureReqVo));
+        }  catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "质疑处理",notes = "采购需求ID必传")
+    @PostMapping("/handleCallQuestion")
+    public AjaxResult handleCallQuestion(@NotEmpty(message = "数据为空")
+                                         @RequestBody PmCallQuestionReqVo pmCallQuestionReqVo) {
+        try {
+            Long demandId = pmCallQuestionReqVo.getDemandId();
+            if(ObjectUtils.isEmpty(demandId)){
+                return error("参数错误");
+            }
+            PmDemand pmDemand = pmDemandService.getById(demandId);
+            if(ObjectUtils.isEmpty(pmDemand)){
+                return error("参数错误");
+            }
+            List<SysFileRef> sysFileRefs = pmCallQuestionReqVo.getSysFileRefs();
+            if(ObjectUtils.isEmpty(sysFileRefs)){
+                return error("参数错误");
+            }
+            if(pmDemandService.uploadFile(demandId, SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType(),sysFileRefs,getUserId().toString())){
+                pmDemand.setCallQuestion(pmCallQuestionReqVo.getCallQuestion());
+                pmDemand.setUpdateBy(getUserId().toString());
+                pmDemand.setUpdateTime(new Date());
+                return toAjax(pmDemandService.updateById(pmDemand));
+            } else {
+                return error("保存上传附件失败");
+            }
+
+        }  catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "上传中标通知书",notes = "采购需求ID和上传附件必传")
+    @PostMapping("/uploadBidWinningNotification")
+    public AjaxResult uploadBidWinningNotification(@NotEmpty(message = "数据为空") @RequestBody PmPurchaseExecutionReqVo pmPurchaseExecutionReqVo) {
+        Long demandId = pmPurchaseExecutionReqVo.getDemandId();
+        if(ObjectUtils.isEmpty(demandId)){
+            return error("参数错误");
+        }
+
+        PmDemand pmDemand = pmDemandService.getById(demandId);
+        if(ObjectUtils.isEmpty(pmDemand)){
+            return error("参数错误");
+        }
+
+        List<SysFileRef> sysFileRefs = pmPurchaseExecutionReqVo.getSysFileRefs();
+        if(ObjectUtils.isEmpty(sysFileRefs)){
+            return error("参数错误");
+        }
+        if (pmDemandService.uploadFile(demandId, SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType(),sysFileRefs,getUserId().toString())) {
+            PmDemand pmDemandUpdate = new PmDemand();
+            pmDemandUpdate.setDemandId(demandId);
+            pmDemandUpdate.setProjectStatus(Long.parseLong(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
+            pmDemandUpdate.setUpdateTime(new Date());
+            pmDemandUpdate.setUpdateBy(getUserId().toString());
+            return success(pmDemandService.updateById(pmDemandUpdate));
+        } else {
+            return error("保存上传附件失败");
+        }
+    }
 
+    /**
+     * 查看详情
+     */
+    @ApiOperation(value = "查看详情", notes = "必传demandId和详情类型(1项目计划，2需求建档，3任务下达,4中标信息，5合同信息，6建设情况),其他字段不传")
+    @PostMapping("/view")
+    public AjaxResult view(@RequestBody PmDemandReqVo pmDemandReqVo) {
+        if(pmDemandReqVo.getDemandId() == null){
+            return AjaxResult.error("demandId不能为空");
+        }
+        if(StringUtils.isEmpty(pmDemandReqVo.getDetailType())){
+            return AjaxResult.error("详情的类型不能为空");
+        }
+        return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
     }
 }

purchase-common/src/main/java/com/ozs/common/enums/ExpertType.java

@@ -0,0 +1,29 @@
+package com.ozs.common.enums;
+
+/**
+ * 专家类型
+ *
+ * @author buzhanyi
+ */
+public enum ExpertType {
+    TECHNICAL_EXPERT("1", "技术专家"),
+    ECONOMIC_EXPERT("2", "经济专家"),
+    LEGALAFFAIRS_EXPERT("3", "法务专家"),
+    SPARE_EXPERT("4", "备用专家");
+
+    private final String code;
+    private final String info;
+
+    ExpertType(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

purchase-common/src/main/java/com/ozs/common/enums/SysFileRefEnum.java

@@ -19,7 +19,14 @@ public enum SysFileRefEnum {
     PM_DEMAND_ENGINEERING(8, "采购需求工程类附件"),
     PM_DEMAND_EXAMINE(9, "采购需求审核文件"),
     PM_TAST_RELEASE(10, "任务下达文件"),
-    PM_BID_FILE(11, "招标文件")
+    PM_BID_FILE(11, "招标文件"),
+    PM_ANNOUNCEMENT_FILE(12, "公告文件"),
+    PM_BID_WINNING_FILE(13, "中标文件"),
+    PM_BID_FAILURE_FILE(14, "流标文件"),
+    PM_BID_CALL_QEUSTION_FILE(15, "质疑文件"),
+    PM_BID_WINNING_NOTIFICATION(16, "中标通知书"),
+    PM_CONTRACT_INFO (17, "合同信息附件"),
+    PM_PROJECT_CONSTRUCTION (18, "建设文档附件")
     ;
 
     private Integer type;

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

@@ -0,0 +1,29 @@
+package com.ozs.common.utils;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class RandomUtil {
+    public static List getRandomList(List list, int randomSeriesLength){
+        if(randomSeriesLength >  list.size()){
+            randomSeriesLength = list.size();
+        }
+        Collections.shuffle(list);
+        List randomSeries = list.subList(0, randomSeriesLength);
+        return randomSeries;
+    }
+    public static void main(String args[]){
+        List<Object> list = new ArrayList<>();
+        list.add("1");
+        list.add("2");
+        list.add("3");
+        list.add("4");
+        list.add("5");
+        list = getRandomList(list,8);
+        for(Object o: list){
+            System.out.println(o);
+        }
+    }
+}

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

@@ -4,13 +4,14 @@ 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 com.ozs.common.vo.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.joda.time.DateTime;
 
 @Data
 @TableName("base_expert")
-public class BaseExpert {
+public class BaseExpert extends BaseDto {
 
     /**
      * 主键ID
@@ -29,7 +30,7 @@ public class BaseExpert {
     /**
      * 专家类型
      */
-    @ApiModelProperty(value = "专家类型")
+    @ApiModelProperty(value = "专家类型，多个使用英文逗号分隔")
     @TableField("expert_type")
     private String expertType;
 
@@ -58,7 +59,7 @@ public class BaseExpert {
     /**
      * 专业类型
      */
-    @ApiModelProperty(value = "专业类型")
+    @ApiModelProperty(value = "专业类型，多个使用英文逗号分隔")
     @TableField("major_type")
     private String majorType;
 
@@ -79,7 +80,7 @@ public class BaseExpert {
     /**
      * 采购品种
      */
-    @ApiModelProperty(value = "采购品种")
+    @ApiModelProperty(value = "采购品种，多个使用英文逗号分隔")
     @TableField("variety_purchase")
     private String varietyPurchase;
 

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

@@ -37,7 +37,7 @@ public class PlanQuarter {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    private String purchaseDeptId;
+    private Long purchaseDeptId;
 
     @Excel(name = "采购单位")
     @TableField(exist = false)

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

@@ -29,7 +29,7 @@ public class PlanYears {
      * 采购单位（登录账号的单位）
      */
     @NotNull(message = "采购单位不能为空")
-    private String purchaseDeptId;
+    private Long purchaseDeptId;
 
     @Excel(name = "采购单位")
     @TableField(exist = false)

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

@@ -8,6 +8,7 @@ import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -137,6 +138,10 @@ public class PlanQuarterStandardVo extends PageVo {
      */
     @ApiModelProperty(value = "退回原因")
     private String reasonOfReturn;
+    /**
+     * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
+     */
+    private String adjustReason;
 
     /**
      * 创建者

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

@@ -8,6 +8,7 @@ import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -134,6 +135,11 @@ public class PlanYearsStandardVo extends PageVo {
     @ApiModelProperty(value = "退回原因")
     private String reasonOfReturn;
 
+    /**
+     * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
+     */
+    private String adjustReason;
+
     /**
      * 创建者
      */

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

@@ -4,6 +4,7 @@ package com.ozs.plan.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanQuarter;
+import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -64,6 +65,14 @@ public interface PlanQuarterMapper extends BaseMapper<PlanQuarter> {
      */
     public PlanQuarter getById(Long planPracticalId);
 
+    /**
+     * 根据年度计划id查询季度计划
+     *
+     * @param planYearId 年度计划ID
+     * @return 结果
+     */
+    public PlanQuarter getByPlanYearId(Long planYearId);
+
     /**
      * 查询项目名称是否存在(除自己以外)
      *
@@ -84,7 +93,7 @@ public interface PlanQuarterMapper extends BaseMapper<PlanQuarter> {
 
     public Integer commit(Long planPracticalId);
 
-    public Integer review(PlanQuarter ofYears);
+    public Integer review(PlanQuarterStandardVo vo);
 
     Integer sendLetter(Long planPracticalId);
 }

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

@@ -3,6 +3,7 @@ package com.ozs.plan.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -83,7 +84,7 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
 
     public Integer commit(Long planYearId);
 
-    public Integer review(PlanYears ofYears);
+    public Integer review(PlanYearsStandardVo vo);
 
     Integer sendLetter(Long planYearId);
 }

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

@@ -8,6 +8,8 @@ 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.model.LoginUser;
+import com.ozs.common.enums.DataIsDelete;
+import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
 import com.ozs.common.enums.ProjectTypes;
 import com.ozs.common.enums.SysFileRefEnum;
@@ -22,6 +24,8 @@ import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.mapper.PlanQuarterMapper;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanQuarterService;
+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.vo.responseVo.SysDeptResponseVo;
@@ -68,6 +72,8 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     private SysDeptMapper deptMapper;
     @Autowired
     private SysFileService fileService;
+    @Autowired
+    private PmDemandMapper pmDemandMapper;
 
     @Override
     public Page selectPlanQuarterList(PlanQuarterStandardVo vo) {
@@ -112,6 +118,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -169,6 +176,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanQuarter::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanQuarter::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanQuarter> page = planQuarterMapper.selectPage(new Page<PlanQuarter>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -317,7 +325,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
+                        ofYear.setPurchaseDeptId(info.getDeptId());
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
@@ -406,8 +414,9 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
     @Override
     @Transactional
     public AjaxResult reviewTo(PlanQuarterStandardVo vo) {
+        //季度计划审核通过后同步到年度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
-        BeanUtils.copyProperties(vo, quarters);
+        PmDemand demand = new PmDemand();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
@@ -416,20 +425,36 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
         }
-        quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        return review(vo, quarters);
+        BeanUtils.copyProperties(byId, demand);
+        demand.setPlanId(byId.getPlanPracticalId());
+        //同步到项目管理状态为需求待填制
+        demand.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_FILL.getCode()));
+        demand.setCreateTime(new Date());
+        pmDemandMapper.insert(demand);
+        //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+        LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
+        sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
+        List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(demand.getDemandId());
+                ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                sysFileRefMapper.insert(ref);
+            }
+        }
+        vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+        return review(vo);
     }
 
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanQuarterStandardVo vo) {
-        PlanQuarter quarters = new PlanQuarter();
-        BeanUtils.copyProperties(vo, quarters);
-        quarters.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
-        return review(vo, quarters);
+        vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        return review(vo);
     }
 
-    private AjaxResult review(PlanQuarterStandardVo vo, PlanQuarter quarters) {
+    private AjaxResult review(PlanQuarterStandardVo vo) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -442,7 +467,7 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
                 sysFileRefMapper.insert(ref);
             }
         }
-        int review = planQuarterMapper.review(quarters);
+        int review = planQuarterMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
@@ -451,11 +476,16 @@ public class PlanQuarterServiceImpl implements PlanQuarterService {
 
     @Override
     public AjaxResult appUpdate(PlanQuarterStandardVo vo) {
-        PlanQuarter quarters = new PlanQuarter();
-        BeanUtils.copyProperties(vo, quarters);
+        //如果项目管理中数据已填制，则不允许申请修改
+        LambdaQueryWrapper<PmDemand> demandLp = new LambdaQueryWrapper<>();
+        demandLp.eq(PmDemand::getPlanId, vo.getPlanPracticalId());
+        PmDemand demand = pmDemandMapper.selectOne(demandLp);
+        if (!String.valueOf(demand.getProjectStatus()).equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
+            return AjaxResult.error("项目信息已填制，不可更改");
+        }
         //申请后会成为未提交的状态，可以进行修改
-        quarters.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        int review = planQuarterMapper.review(quarters);
+        vo.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+        int review = planQuarterMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }

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

@@ -10,6 +10,7 @@ import com.ozs.common.core.domain.entity.SysDictData;
 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.DataIsDelete;
 import com.ozs.common.enums.IsExcess;
 import com.ozs.common.enums.PmProjectStatus;
 import com.ozs.common.enums.ProjectStatus;
@@ -40,6 +41,7 @@ import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.ISysUserService;
 import com.ozs.system.service.SysFileService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -92,6 +94,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
+            if (!ObjectUtils.isEmpty(vo.getPurchaseDeptId())) {
+                ofYears.setPurchaseDeptId(Long.valueOf(vo.getPurchaseDeptId()));
+            }
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
             planYearsList = changeTo(planYears);
         } catch (Exception e) {
@@ -128,6 +133,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -147,6 +153,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         List<PlanYears> planYearsList = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
+            ofYears.setPurchaseDeptId(Long.valueOf(vo.getPurchaseDeptId()));
             planYears = planYearsMapper.selectPlanYearsExamineList(ofYears);
             planYearsList = changeTo(planYears);
         } catch (Exception e) {
@@ -185,6 +192,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (!ObjectUtils.isEmpty(vo.getEndTime())) {
                     lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
                 }
+                lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete);
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();
@@ -206,6 +214,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
+            ofYears.setPurchaseDeptId(Long.valueOf(yearsStandardVo.getPurchaseDeptId()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -278,6 +287,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears ofYears = new PlanYears();
         try {
             BeanUtils.copyProperties(yearsStandardVo, ofYears);
+            ofYears.setPurchaseDeptId(Long.valueOf(yearsStandardVo.getPurchaseDeptId()));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -335,7 +345,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
-                        ofYear.setPurchaseDeptId(String.valueOf(info.getDeptId()));
+                        ofYear.setPurchaseDeptId(info.getDeptId());
                     } else {
                         ++failureNum;
                         failureMsg.append("*" + failureNum + "*采购单位“" + ofYear.getPurchaseDeptName() + "”不存在");
@@ -424,29 +434,53 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Override
     @Transactional
     public AjaxResult reviewTo(PlanYearsStandardVo vo) {
+        //年度计划审核通过后同步到季度计划和项目管理
         PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(vo, ofYears);
-        //年度计划审核通过后同步到季度计划
-        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
         PlanQuarter quarters = new PlanQuarter();
+        PmDemand demand = new PmDemand();
+        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
         BeanUtils.copyProperties(byId, quarters);
-        quarters.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        planQuarterMapper.insertPlanQuarter(quarters);
-        ofYears.setPlanYearId(vo.getPlanYearId());
-        ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        return review(vo, ofYears);
+        BeanUtils.copyProperties(byId, demand);
+
+        //同步到季度计划状态为已审核---(已审核过的不再同步)
+        PlanQuarter quarter = planQuarterMapper.getByPlanYearId(vo.getPlanYearId());
+        if (ObjectUtils.isEmpty(quarter)) {
+            quarters.setPlanYearId(byId.getPlanYearId());
+            quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+            quarters.setCreateTime(new Date());
+            planQuarterMapper.insertPlanQuarter(quarters);
+            //同步到项目管理状态为需求待填制
+            demand.setPlanId(quarters.getPlanPracticalId());
+            demand.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_FILL.getCode()));
+            demand.setCreateTime(new Date());
+            pmDemandMapper.insert(demand);
+            //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+            LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+            sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
+            sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
+            List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+            if (!ObjectUtils.isEmpty(sysFileRefs)) {
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(demand.getDemandId());
+                    ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                    ref.setId(null);
+                    sysFileRefMapper.insert(ref);
+                }
+            }
+        }
+
+        vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+        return review(vo);
     }
 
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanYearsStandardVo vo) {
-        PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(vo, ofYears);
-        ofYears.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
-        return review(vo, ofYears);
+        vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        return review(vo);
     }
 
-    private AjaxResult review(PlanYearsStandardVo vo, PlanYears ofYears) {
+    private AjaxResult review(PlanYearsStandardVo vo) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -459,7 +493,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 sysFileRefMapper.insert(ref);
             }
         }
-        int review = planYearsMapper.review(ofYears);
+        int review = planYearsMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
@@ -468,11 +502,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Override
     public AjaxResult appUpdate(PlanYearsStandardVo vo) {
-        PlanYears ofYears = new PlanYears();
-        BeanUtils.copyProperties(vo, ofYears);
         //申请后会成为未提交的状态，可以进行修改
-        ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        int review = planYearsMapper.review(ofYears);
+        vo.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+        int review = planYearsMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }

purchase-system/src/main/java/com/ozs/pm/doman/PmBidOpening.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,7 +52,10 @@ public class PmBidOpening implements Serializable {
     @TableField("SCORE")
     private Double score;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("开标时间")
+    @TableField("OPEN_BID_TIME")
+    private Date openBidTime;
 
     @ApiModelProperty("创建者")
     @TableField("CREATE_BY")

purchase-system/src/main/java/com/ozs/pm/doman/PmBidWinning.java

@@ -42,11 +42,6 @@ public class PmBidWinning implements Serializable {
     private Long demandId;
 
 
-    @ApiModelProperty("开标信息ID")
-    @TableField("BID_OPENING_ID")
-    private Long bidOpeningId;
-
-
     @ApiModelProperty("中标金额(万元)")
     @TableField("BID_WINNING_AMOUNT")
     private Double bidWinningAmount;

purchase-system/src/main/java/com/ozs/pm/doman/PmBidWinningOpeningRef.java

@@ -0,0 +1,70 @@
+package com.ozs.pm.doman;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 中标开标关联表(PmBidWinningOpeningRef)实体类
+ *
+ * @author makejava
+ * @since 2023-02-05 09:44:12
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_bid_winning_opening_ref")
+@ApiModel(value = "中标开标关联表", description = "")
+public class PmBidWinningOpeningRef implements Serializable {
+    private static final long serialVersionUID = -83530061962122026L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("中标ID")
+    @TableField("WINNING_ID")
+    private Long winningId;
+
+
+    @ApiModelProperty("开标ID")
+    @TableField("OPENING_ID")
+    private Long openingId;
+
+
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
+}

purchase-system/src/main/java/com/ozs/pm/doman/PmContractUnitRef.java

@@ -46,6 +46,9 @@ public class PmContractUnitRef implements Serializable {
     @TableField("DEMAND_ID")
     private Long demandId;
 
+    @ApiModelProperty("单位ID（供应商或需求单位ID)")
+    @TableField("UNIT_ID")
+    private Long unitId;
 
     @ApiModelProperty("单位类型，A:甲方，B：乙方")
     @TableField("UNIT_TYPE")

purchase-system/src/main/java/com/ozs/pm/doman/PmDemand.java

@@ -1,18 +1,17 @@
 package com.ozs.pm.doman;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
 
 /**
  * 采购需求对象 pm_demand
@@ -21,121 +20,168 @@ import lombok.NoArgsConstructor;
  * @date 2023-01-16
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求对象")
-public class PmDemand extends BaseEntity
-{
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_demand")
+@ApiModel(value = "采购需求表", description = "")
+public class PmDemand implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
-    @TableId(type = IdType.AUTO)
+    @TableId(value = "DEMAND_ID", type = IdType.AUTO)
     private Long demandId;
 
     /** 计划ID */
-    @Excel(name = "计划ID")
+    @ApiModelProperty("计划ID")
+    @TableField("PLAN_ID")
     private Long planId;
 
     /** 采购单位（登录账号的单位） */
-    @Excel(name = "采购单位", readConverterExp = "登=录账号的单位")
+    @ApiModelProperty("采购单位（登录账号的单位）")
+    @TableField("PURCHASE_DEPT_ID")
     private Long purchaseDeptId;
 
     /** 项目名称 */
-    @Excel(name = "项目名称")
+    @ApiModelProperty("项目名称")
+    @TableField("PROJECT_NAME")
     private String projectName;
 
     /** 项目类型（0：装备类；1：物资类；2：服务类；3：工程类） */
-    @Excel(name = "项目类型", readConverterExp = "0=：装备类；1：物资类；2：服务类；3：工程类")
+    @ApiModelProperty("项目类型（0：装备类；1：物资类；2：服务类；3：工程类）")
+    @TableField("PROJECT_TYPE")
     private String projectType;
 
     /** 需求概况 */
-    @Excel(name = "需求概况")
+    @ApiModelProperty("需求概况")
+    @TableField("DEMAND_OVERVIEW")
     private String demandOverview;
 
     /** 概算金额(万元（保留小数点后两位） */
-    @Excel(name = "概算金额(万元", readConverterExp = "保=留小数点后两位")
+    @ApiModelProperty("概算金额(万元（保留小数点后两位）")
+    @TableField("EVALUATION")
     private BigDecimal evaluation;
 
     /** 是否为超限额计划(0:未超额，1:超额) */
-    @Excel(name = "是否为超限额计划(0:未超额，1:超额)")
+    @ApiModelProperty("是否为超限额计划(0:未超额，1:超额)")
+    @TableField("IS_EXCESS")
     private Integer isExcess;
 
     /** 采购服务站 */
-    @Excel(name = "采购服务站")
+    @ApiModelProperty("采购服务站")
+    @TableField("PURCHASE_SERVICES")
     private String purchaseServices;
 
     /** 采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价) */
-    @Excel(name = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    @ApiModelProperty("采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
+    @TableField("PURCHASE_MODE")
     private String purchaseMode;
 
     /** 计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月） */
-    @Excel(name = "计划提报需求时间--->需求单位成功提报采购需求的日期", readConverterExp = "具=体到月")
+    @ApiModelProperty("计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
+    @TableField("PLAN_DEMAND_SUB_TIME")
     private Date planDemandSubTime;
 
     /** 计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月） */
-    @Excel(name = "计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期", readConverterExp = "具=体到月")
+    @ApiModelProperty("计划完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到月）")
+    @TableField("PLAN_PURCHASE_FINISH_TIME")
     private Date planPurchaseFinishTime;
 
     /** 计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("计划交付时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期")
+    @TableField("PLAN_DELIVER_TIME")
     private Date planDeliverTime;
 
     /** 项目属性（0:应急应战项目， 1:重大规划任务项目， 2:规划任务项目， 3:一般项目） */
-    @Excel(name = "项目属性", readConverterExp = "0=:应急应战项目，,1=:重大规划任务项目，,2=:规划任务项目，,3=:一般项目")
+    @ApiModelProperty("项目属性（0:应急应战项目， 1:重大规划任务项目， 2:规划任务项目， 3:一般项目）")
+    @TableField("PROJECT_ATTR")
     private String projectAttr;
 
     /** 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息 */
-    @Excel(name = "计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
+    @ApiModelProperty("计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
+    @TableField("ADJUST_REASON")
     private String adjustReason;
 
     /** 备注 */
-    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    @TableField("REMARKS")
     private String remarks;
 
     /** 实际提报需求时间--->需求单位成功提报采购需求的日期（具体到日） */
-    @Excel(name = "实际提报需求时间--->需求单位成功提报采购需求的日期", readConverterExp = "具=体到日")
+    @ApiModelProperty("实际提报需求时间--->需求单位成功提报采购需求的日期（具体到日）")
+    @TableField("REAL_DEMAND_COMMIT_TIME")
     private Date realDemandCommitTime;
 
     /** 实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到日） */
-    @Excel(name = "实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期", readConverterExp = "具=体到日")
+    @ApiModelProperty("实际完成采购时间--->公示中标结果的日期，即填制中标信息的日期（具体到日）")
+    @TableField("REAL_PURCHASE_FINISH_TIME")
     private Date realPurchaseFinishTime;
 
     /** 实际交付（实施）时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期 */
-    @Excel(name = "实际交付", readConverterExp = "实=施")
+    @ApiModelProperty("实际交付（实施）时间--->供应商完成并交付后，使用单位收到标的日期，即填制建设文档的日期")
+    @TableField("REAL_DELIVER_TIME")
     private Date realDeliverTime;
 
     /** 审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("审核时间")
+    @TableField("AUDIT_TIME")
     private Date auditTime;
 
     /** 预警状态(0:正常，1:预警) */
-    @Excel(name = "预警状态(0:正常，1:预警)")
+    @ApiModelProperty("预警状态(0:正常，1:预警)")
+    @TableField("WARN_STATUS")
     private String warnStatus;
 
     /** 项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成) */
-    @Excel(name = "项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:任务待下达，8:任务已下达，9:中标信息待填制，10:中标信息已填制，11:合同待填制，12:合同已填制，13:项目建设中，14:项目建设完成)")
+    @ApiModelProperty("项目状态(4:需求待填制，5:需求待提交，6:需求待审核，7:需求已退回，8:任务待下达，9:待选取代理，10:待上传招标文件,11:待发布公告,12:待开标,13:待发布中标公告,14:中标公示中,15:合同待填制，16:项目建设中，17:项目已完成)")
+    @TableField("PROJECT_STATUS")
     private Long projectStatus;
 
     /** 退回原因 */
-    @Excel(name = "退回原因")
+    @ApiModelProperty("退回原因")
+    @TableField("REFUSE_REASON")
     private String refuseReason;
 
     /** 滞后原因 */
-    @Excel(name = "滞后原因")
+    @ApiModelProperty("滞后原因")
+    @TableField("DELAY_REASON")
     private String delayReason;
 
     /** 调整建议 */
-    @Excel(name = "调整建议")
+    @ApiModelProperty("调整建议")
+    @TableField("ADJUST_ADVICE")
     private String adjustAdvice;
 
     /** 抽取招标代理机构id */
-    @Excel(name = "抽取招标代理机构id")
+    @ApiModelProperty("抽取招标代理机构id")
+    @TableField("AGENCY_ID")
     private Long agencyId;
 
     /** 抽取招标代理机构时间 */
-    @Excel(name = "抽取招标代理机构时间")
+    @ApiModelProperty("抽取招标代理机构时间")
+    @TableField("EXTRACT_AGENCY_TIME")
     private Date extractAgencyTime;
+
+    /** 调整建议 */
+    @ApiModelProperty("是否有质疑，1是，0否")
+    @TableField("CALL_QUESTION")
+    private String callQuestion;
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandEngineering.java

@@ -1,118 +1,171 @@
 package com.ozs.pm.doman;
 
-import java.math.BigDecimal;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * 采购需求工程类对象 pm_demand_engineering
+ * 采购需求工程类表(PmDemandEngineering)实体类
  *
- * @author ruoyi
- * @date 2023-01-16
+ * @author makejava
+ * @since 2023-02-04 19:36:13
  */
+
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求工程类对象")
-public class PmDemandEngineering extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_demand_engineering")
+@ApiModel(value = "采购需求工程类表", description = "")
+public class PmDemandEngineering implements Serializable {
+    private static final long serialVersionUID = 907919419476022620L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "DEMAND_ENGINEERING_ID", type = IdType.AUTO)
     private Long demandEngineeringId;
 
-    /** 需求ID */
-    @Excel(name = "需求ID")
+
+    @ApiModelProperty("需求ID")
+    @TableField("DEMAND_ID")
     private Long demandId;
 
-    /** 工程项目名称 */
-    @Excel(name = "工程项目名称")
+
+    @ApiModelProperty("工程项目名称")
+    @TableField("ENGINEERING_NAME")
     private String engineeringName;
 
-    /** 建设地点 */
-    @Excel(name = "建设地点")
+
+    @ApiModelProperty("建设地点")
+    @TableField("CONSTRUCTION_LOCATION")
     private String constructionLocation;
 
-    /** 设计任务书批复文号 */
-    @Excel(name = "设计任务书批复文号")
+
+    @ApiModelProperty("设计任务书批复文号")
+    @TableField("DESIGN_ASSIGNMEN_APPROVAL_NUMBER")
     private String designAssignmenApprovalNumber;
 
-    /** 工程建设计划文号 */
-    @Excel(name = "工程建设计划文号")
-    private BigDecimal projectConstructionPlanNumber;
 
-    /** 任务书批复规模(㎡): */
-    @Excel(name = "任务书批复规模(㎡):")
-    private BigDecimal tassignmentApprovalScale;
+    @ApiModelProperty("工程建设计划文号")
+    @TableField("PROJECT_CONSTRUCTION_PLAN_NUMBER")
+    private Double projectConstructionPlanNumber;
 
-    /** 任务书批复投资 */
-    @Excel(name = "任务书批复投资")
+
+    @ApiModelProperty("任务书批复规模(㎡)")
+    @TableField("TASSIGNMENT_APPROVAL_SCALE")
+    private Double tassignmentApprovalScale;
+
+
+    @ApiModelProperty("任务书批复投资")
+    @TableField("TASSIGNMENT_APPROVAL_INVESTMEN")
     private String tassignmentApprovalInvestmen;
 
-    /** 规划许可文号 */
-    @Excel(name = "规划许可文号")
+
+    @ApiModelProperty("规划许可文号")
+    @TableField("PLANNING_LICENSE_NUMBER")
     private String planningLicenseNumber;
 
-    /** 密级处理 */
-    @Excel(name = "密级处理")
+
+    @ApiModelProperty("密级处理")
+    @TableField("CLASSIFIED_TREATMENT")
     private String classifiedTreatment;
 
-    /** 采购项目规模(㎡) */
-    @Excel(name = "采购项目规模(㎡)")
-    private BigDecimal procurementProjectScale;
 
-    /** 采购项目投资(万元) */
-    @Excel(name = "采购项目投资(万元)")
-    private BigDecimal procurementProjectInvestment;
+    @ApiModelProperty("采购项目规模(㎡)")
+    @TableField("PROCUREMENT_PROJECT_SCALE")
+    private Double procurementProjectScale;
 
-    /** 联系人 */
-    @Excel(name = "联系人")
+
+    @ApiModelProperty("采购项目投资(万元)")
+    @TableField("PROCUREMENT_PROJECT_INVESTMENT")
+    private Double procurementProjectInvestment;
+
+
+    @ApiModelProperty("联系人")
+    @TableField("LINKMAN")
     private String linkman;
 
-    /** 电话 */
-    @Excel(name = "电话")
+
+    @ApiModelProperty("电话")
+    @TableField("PHONE")
     private String phone;
 
-    /** 项目类别 */
-    @Excel(name = "项目类别")
+
+    @ApiModelProperty("项目类别（1勘察，2设计, 3施工，4监理，5咨询，6设备材料）")
+    @TableField("PROJECT_CATEGORY")
     private String projectCategory;
 
-    /** 承包方式 */
-    @Excel(name = "承包方式")
+
+    @ApiModelProperty("承包方式（1工程总承包，2施工总承包，3专业承包）")
+    @TableField("CONTRACTING_MODE")
     private String contractingMode;
 
-    /** 施工图是否完成(0未完成，1完成) */
-    @Excel(name = "施工图是否完成(0未完成，1完成)")
+
+    @ApiModelProperty("施工图是否完成(0未完成，1完成)")
+    @TableField("CONSTRUCTION_DRAWING")
     private String constructionDrawing;
 
-    /** 设计单位 */
-    @Excel(name = "设计单位")
+
+    @ApiModelProperty("设计单位")
+    @TableField("DESIGN_UNIT")
     private String designUnit;
 
-    /** 最高限价 */
-    @Excel(name = "最高限价")
-    private BigDecimal ceilingPrice;
 
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议")
+    @ApiModelProperty("最高限价")
+    @TableField("CEILING_PRICE")
+    private Double ceilingPrice;
+
+
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @TableField("PROCUREMENT_METHOD_SUGGEST")
     private String procurementMethodSuggest;
 
-    /** 投标(报价)人资质等级要求 */
-    @Excel(name = "投标(报价)人资质等级要求")
+
+    @ApiModelProperty("投标(报价)人资质等级要求")
+    @TableField("QUALIFICATION_LEVEL_REQUIREMENT")
     private String qualificationLevelRequirement;
 
-    /** 供应商 */
-    @Excel(name = "供应商")
+
+    @ApiModelProperty("供应商")
+    @TableField("SUPPLIER_ID")
     private Long supplierId;
 
-    /** 备注 */
-    @Excel(name = "备注")
+
+    @ApiModelProperty("备注")
+    @TableField("REMARKS")
     private String remarks;
 
+
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandEquip.java

@@ -1,77 +1,117 @@
 package com.ozs.pm.doman;
 
-import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * 采购需求装备类对象 pm_demand_equip
+ * 采购需求装备类表(PmDemandEquip)实体类
  *
- * @author ruoyi
- * @date 2023-01-16
+ * @author makejava
+ * @since 2023-02-04 19:36:13
  */
+
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求装备类对象")
-public class PmDemandEquip extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_demand_equip")
+@ApiModel(value = "采购需求装备类表", description = "")
+public class PmDemandEquip implements Serializable {
+    private static final long serialVersionUID = -13343009659577628L;
+
+
+    @ApiModelProperty("主键")
+    @TableId(value = "DEMAND_EQUIP_ID", type = IdType.AUTO)
     private Long demandEquipId;
 
-    /** 需求ID */
-    @Excel(name = "需求ID")
+
+    @ApiModelProperty("需求ID")
+    @TableField("DEMAND_ID")
     private Long demandId;
 
-    /** 物资类别及品种名称 */
-    @Excel(name = "物资类别及品种名称")
+
+    @ApiModelProperty("物资类别及品种名称")
+    @TableField("TYPE_AND_NAME")
     private String typeAndName;
 
-    /** 规格型号长*宽*高 */
-    @Excel(name = "规格型号长*宽*高")
+
+    @ApiModelProperty("规格型号长*宽*高")
+    @TableField("SPECIFICATION")
     private String specification;
 
-    /** 质量技术标准(技术参数): */
-    @Excel(name = "质量技术标准(技术参数):")
+
+    @ApiModelProperty("质量技术标准(技术参数):")
+    @TableField("QUALITY_TECHNICAL_STANDARD")
     private String qualityTechnicalStandard;
 
-    /** 计量单位 */
-    @Excel(name = "计量单位")
+
+    @ApiModelProperty("计量单位")
+    @TableField("MEASUREMENT_UNIT")
     private String measurementUnit;
 
-    /** 采购数量 */
-    @Excel(name = "采购数量")
-    private BigDecimal procurementQuantity;
 
-    /** 单价(元) */
-    @Excel(name = "单价(元)")
-    private BigDecimal price;
+    @ApiModelProperty("采购数量")
+    @TableField("PROCUREMENT_QUANTITY")
+    private Double procurementQuantity;
+
 
-    /** 预算金额(万元) */
-    @Excel(name = "预算金额(万元)")
-    private BigDecimal budgetAmount;
+    @ApiModelProperty("单价(元)")
+    @TableField("PRICE")
+    private Double price;
 
-    /** 需求提报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
+
+    @ApiModelProperty("预算金额(万元)")
+    @TableField("BUDGET_AMOUNT")
+    private Double budgetAmount;
+
+
+    @ApiModelProperty("需求提报时间")
+    @TableField("DEMAND_COMMIT_TIME")
     private Date demandCommitTime;
 
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议")
+
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @TableField("PROCUREMENT_METHOD_SUGGEST")
     private String procurementMethodSuggest;
 
-    /** 备注 */
-    @Excel(name = "备注")
+
+    @ApiModelProperty("备注")
+    @TableField("REMARKS")
     private String remarks;
 
+
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandExpertRef.java

@@ -51,6 +51,9 @@ public class PmDemandExpertRef implements Serializable {
     @TableField("CREATE_BY")
     private String createBy;
 
+    @ApiModelProperty("选取时间")
+    @TableField("ACCESS_TIME")
+    private Date accessTime;
 
     @ApiModelProperty("创建时间")
     @TableField("CREATE_TIME")

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandMaterials.java

@@ -1,101 +1,117 @@
 package com.ozs.pm.doman;
 
-import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * 采购需求物资类对象 pm_demand_materials
+ * 采购需求物资类表(PmDemandMaterials)实体类
  *
- * @author ruoyi
- * @date 2023-01-16
+ * @author makejava
+ * @since 2023-02-04 19:36:14
  */
+
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求物资类对象")
-public class PmDemandMaterials extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_demand_materials")
+@ApiModel(value = "采购需求物资类表", description = "")
+public class PmDemandMaterials implements Serializable {
+    private static final long serialVersionUID = -69155120615102721L;
+
+
+    @ApiModelProperty("主键")
+    @TableId(value = "DEMAND_MATERIALS_ID", type = IdType.AUTO)
     private Long demandMaterialsId;
 
-    /**
-     * 需求ID
-     */
-    @Excel(name = "需求ID")
+
+    @ApiModelProperty("需求ID")
+    @TableField("DEMAND_ID")
     private Long demandId;
 
-    /**
-     * 物资类别及品种名称
-     */
-    @Excel(name = "物资类别及品种名称")
+
+    @ApiModelProperty("物资类别及品种名称")
+    @TableField("TYPE_AND_NAME")
     private String typeAndName;
 
-    /**
-     * 规格型号长*宽*高
-     */
-    @Excel(name = "规格型号长*宽*高")
+
+    @ApiModelProperty("规格型号长*宽*高")
+    @TableField("SPECIFICATION")
     private String specification;
 
-    /**
-     * 质量技术标准(技术参数):
-     */
-    @Excel(name = "质量技术标准(技术参数):")
+
+    @ApiModelProperty("质量技术标准(技术参数):")
+    @TableField("QUALITY_TECHNICAL_STANDARD")
     private String qualityTechnicalStandard;
 
-    /**
-     * 计量单位
-     */
-    @Excel(name = "计量单位")
+
+    @ApiModelProperty("计量单位")
+    @TableField("MEASUREMENT_UNIT")
     private String measurementUnit;
 
-    /**
-     * 采购数量
-     */
-    @Excel(name = "采购数量")
-    private BigDecimal procurementQuantity;
-
-    /**
-     * 单价(元)
-     */
-    @Excel(name = "单价(元)")
-    private BigDecimal price;
-
-    /**
-     * 预算金额(万元)
-     */
-    @Excel(name = "预算金额(万元)")
-    private BigDecimal budgetAmount;
-
-    /**
-     * 需求提报时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "需求提报时间", width = 30, dateFormat = "yyyy-MM-dd")
+
+    @ApiModelProperty("采购数量")
+    @TableField("PROCUREMENT_QUANTITY")
+    private Double procurementQuantity;
+
+
+    @ApiModelProperty("单价(元)")
+    @TableField("PRICE")
+    private Double price;
+
+
+    @ApiModelProperty("预算金额(万元)")
+    @TableField("BUDGET_AMOUNT")
+    private Double budgetAmount;
+
+
+    @ApiModelProperty("需求提报时间")
+    @TableField("DEMAND_COMMIT_TIME")
     private Date demandCommitTime;
 
-    /**
-     * 采购方式建议
-     */
-    @Excel(name = "采购方式建议")
+
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @TableField("PROCUREMENT_METHOD_SUGGEST")
     private String procurementMethodSuggest;
 
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
+
+    @ApiModelProperty("备注")
+    @TableField("REMARKS")
     private String remarks;
 
 
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmDemandServe.java

@@ -1,74 +1,117 @@
 package com.ozs.pm.doman;
 
-import java.math.BigDecimal;
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * 采购需求服务类对象 pm_demand_serve
+ * 采购需求服务类表(PmDemandServe)实体类
  *
- * @author ruoyi
- * @date 2023-01-16
+ * @author makejava
+ * @since 2023-02-04 19:36:15
  */
+
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("采购需求服务类对象")
-public class PmDemandServe extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_demand_serve")
+@ApiModel(value = "采购需求服务类表", description = "")
+public class PmDemandServe implements Serializable {
+    private static final long serialVersionUID = -91312266847333541L;
+
+
+    @ApiModelProperty("主键")
+    @TableId(value = "DEMAND_SERVE_ID", type = IdType.AUTO)
     private Long demandServeId;
 
-    /** 需求ID */
-    @Excel(name = "需求ID")
+
+    @ApiModelProperty("需求ID")
+    @TableField("DEMAND_ID")
     private Long demandId;
 
-    /** 服务项目名称 */
-    @Excel(name = "服务项目名称")
+
+    @ApiModelProperty("服务项目名称")
+    @TableField("SERVICE_NAME")
     private String serviceName;
 
-    /** 技术服务要求 */
-    @Excel(name = "技术服务要求")
+
+    @ApiModelProperty("技术服务要求")
+    @TableField("TECHNICAL_SERVICE_REQUIREMENT")
     private String technicalServiceRequirement;
 
-    /** 计量单位 */
-    @Excel(name = "计量单位")
+
+    @ApiModelProperty("计量单位")
+    @TableField("MEASUREMENT_UNIT")
     private String measurementUnit;
 
-    /** 采购数量 */
-    @Excel(name = "采购数量")
-    private BigDecimal procurementQuantity;
 
-    /** 单价(元) */
-    @Excel(name = "单价(元)")
-    private BigDecimal price;
+    @ApiModelProperty("采购数量")
+    @TableField("PROCUREMENT_QUANTITY")
+    private Double procurementQuantity;
+
+
+    @ApiModelProperty("单价(元)")
+    @TableField("PRICE")
+    private Double price;
 
-    /** 预算金额(万元) */
-    @Excel(name = "预算金额(万元)")
-    private BigDecimal budgetAmount;
 
-    /** 交货期限 */
-    @Excel(name = "交货期限")
+    @ApiModelProperty("预算金额(万元)")
+    @TableField("BUDGET_AMOUNT")
+    private Double budgetAmount;
+
+
+    @ApiModelProperty("交货期限")
+    @TableField("DELIVERY_TIME_LIMIT")
     private String deliveryTimeLimit;
 
-    /** 采购方式建议 */
-    @Excel(name = "采购方式建议")
+
+    @ApiModelProperty("采购方式建议（1公开招标，2邀请招标，3竞争性谈判，4询价，5单一来源）")
+    @TableField("PROCUREMENT_METHOD_SUGGEST")
     private String procurementMethodSuggest;
 
-    /** 供应商 */
-    @Excel(name = "供应商")
+
+    @ApiModelProperty("供应商")
+    @TableField("SUPPLIER_ID")
     private Long supplierId;
 
-    /** 备注 */
-    @Excel(name = "备注")
+
+    @ApiModelProperty("备注")
+    @TableField("REMARKS")
     private String remarks;
 
+
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmFlowChart.java

@@ -1,42 +1,76 @@
 package com.ozs.pm.doman;
 
-import com.ozs.common.annotation.Excel;
-import com.ozs.common.core.domain.BaseEntity;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
- * 流程图对象 pm_flow_chart
+ * 流程图表(PmFlowChart)实体类
  *
- * @author ruoyi
- * @date 2023-01-25
+ * @author makejava
+ * @since 2023-02-04 19:36:15
  */
+
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel("流程图对象")
-public class PmFlowChart extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pm_flow_chart")
+@ApiModel(value = "流程图表", description = "")
+public class PmFlowChart implements Serializable {
+    private static final long serialVersionUID = 313515206301363060L;
+
+    @ApiModelProperty("主键")
+    @TableId(value = "FLOW_CHART_ID", type = IdType.AUTO)
     private Long flowChartId;
 
-    /** 模块名称 */
-    @Excel(name = "模块名称")
+
+    @ApiModelProperty("模块名称")
+    @TableField("MODULE_NAME")
     private String moduleName;
 
-    /** 部门角色 */
-    @Excel(name = "部门角色")
+
+    @ApiModelProperty("部门角色")
+    @TableField("DEPT_ROLE")
     private String deptRole;
 
-    /** 提示文案 */
-    @Excel(name = "提示文案")
+
+    @ApiModelProperty("提示文案")
+    @TableField("PROMPT_WORDS")
     private String promptWords;
 
 
+    @ApiModelProperty("创建者")
+    @TableField("CREATE_BY")
+    private String createBy;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    @TableField("UPDATE_BY")
+    private String updateBy;
+
+
+    @ApiModelProperty("更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+
 }

purchase-system/src/main/java/com/ozs/pm/doman/PmReleaseAnnouncement.java

@@ -49,7 +49,7 @@ public class PmReleaseAnnouncement implements Serializable {
 
     @ApiModelProperty("发布时间")
     @TableField("RELEASE_TIME")
-    private String releaseTime;
+    private Date releaseTime;
 
 
     @ApiModelProperty("开标地点")

purchase-system/src/main/java/com/ozs/pm/doman/vo/PmBaseSupplierVo.java

@@ -0,0 +1,71 @@
+package com.ozs.pm.doman.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PmBaseSupplierVo {
+
+    @ApiModelProperty(value = "主键id")
+    private Integer id;
+
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty("供应商负责人")
+    private String supplierResponsiblePerson;
+
+    @ApiModelProperty("供应商地址")
+    private String supplierAddress;
+
+    @ApiModelProperty("供应商类型")
+    private String supplierType;
+
+    @ApiModelProperty("状态 黑白名单")
+    private String supplierState;
+
+    @ApiModelProperty("预先采购")
+    private String supplierAdvancePurchase;
+
+    @ApiModelProperty(value = "邮政编码")
+    private String postalCode;
+
+    @ApiModelProperty(value = "项目联系人")
+    private String projectPerson;
+
+    @ApiModelProperty(value = "联系电话")
+    private String telephone;
+
+    @ApiModelProperty(value = "银行账户名称")
+    private String bankAccountName;
+
+    @ApiModelProperty(value = "开户银行")
+    private String bankOfDeposit;
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccountNumber;
+
+    @ApiModelProperty(value = "创建者")
+    private String created;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改者")
+    private String updated;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("合同签订地点")
+    private String contractSignPlace;
+
+    @ApiModelProperty("合同签订日期")
+    private Date contractSignDate;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/PmBaseUnitInformationVo.java

@@ -0,0 +1,48 @@
+package com.ozs.pm.doman.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author : sunhh
+ * @create 2023/2/2 17:59
+ */
+@Data
+@TableName("base_unit_information")
+public class PmBaseUnitInformationVo {
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String created;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("合同签订地点")
+    private String contractSignPlace;
+
+    @ApiModelProperty("合同签订日期")
+    private Date contractSignDate;
+
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBaseExpertExtractReqVo.java

@@ -0,0 +1,37 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PmBaseExpertExtractReqVo extends BaseEntity {
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+    @ApiModelProperty("选取时间 yyy-MM-dd")
+    private String accessTime;
+
+    @ApiModelProperty("技术专家数量")
+    private Integer technicalExpertNumber;
+
+    @ApiModelProperty("经济专家数量")
+    private Integer economicExpertNumber;
+
+    @ApiModelProperty("法务专家数量")
+    private Integer legalAffairsExpertNumber;
+
+    @ApiModelProperty("备用专家数量")
+    private Integer spareExpertNumber;
+
+    @ApiModelProperty("专家专业，多个用逗号分隔")
+    private String professional;
+
+    @ApiModelProperty("所在区域")
+    private String localArea;
+
+    @ApiModelProperty("需要回避单位，多个用逗号分隔")
+    private String needAvoidUnit;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBaseExpertReqVo.java

@@ -8,11 +8,14 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class PmBaseExpertReqVo extends BaseEntity {
+public class PmBaseExpertFillReqVo extends BaseEntity {
 
     @ApiModelProperty("需求ID")
     private Long demandId;
 
     @ApiModelProperty("专家信息列表")
     private List<BaseExpert> baseExpertList;
+
+    @ApiModelProperty("选取时间 yyy-MM-dd")
+    private String accessTime;
 }

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBidFailureReqVo.java

@@ -0,0 +1,60 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 流标基本情况表(PmBidFailure)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:21
+ */
+
+@Data
+public class PmBidFailureReqVo implements Serializable {
+    private static final long serialVersionUID = 491684278331772388L;
+
+    private Long id;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("流标原因")
+    private String bidFailureReason;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("流标时间")
+    private Date bidFailureTime;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 上传附件
+     */
+    @ApiModelProperty("上传附件")
+    private List<SysFileRef> sysFileRefs;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBidOpeningFillReqVo.java

@@ -0,0 +1,20 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+import com.ozs.common.core.domain.BaseEntity;
+import com.ozs.pm.doman.PmBidOpening;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PmBidOpeningFillReqVo extends BaseEntity {
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+    @ApiModelProperty("开标信息列表")
+    private List<PmBidOpening> pmBidOpeningList;
+
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmBidWinningReqVo.java

@@ -0,0 +1,72 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.pm.doman.PmBidOpening;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 中标基本情况表(PmBidWinning)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:22
+ */
+
+@Data
+@ApiModel(value = "中标基本情况表", description = "")
+public class PmBidWinningReqVo implements Serializable {
+    private static final long serialVersionUID = -23785941414293726L;
+
+    private Long id;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("中标金额(万元)")
+    private Double bidWinningAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("中标公告时间")
+    private Date bidAnnouncementTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("中标公告截止时间")
+    private Date bidAnnouncementCloseTime;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 中标单位信息列表
+     */
+    @ApiModelProperty("中标单位信息列表")
+    private List<Long> pmBidOpeningIdList;
+
+    /**
+     * 上传附件
+     */
+    @ApiModelProperty("上传附件")
+    private List<SysFileRef> sysFileRefs;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmCallQuestionReqVo.java

@@ -0,0 +1,54 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 流标基本情况表(PmBidFailure)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:21
+ */
+
+@Data
+public class PmCallQuestionReqVo implements Serializable {
+    private static final long serialVersionUID = 491684278331772388L;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("是否有质疑，1是，0否")
+    private String callQuestion;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 上传附件
+     */
+    @ApiModelProperty("上传附件")
+    private List<SysFileRef> sysFileRefs;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmContractInfoReqVo.java

@@ -0,0 +1,78 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.pm.doman.vo.PmBaseSupplierVo;
+import com.ozs.pm.doman.vo.PmBaseUnitInformationVo;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 合同信息表(PmContractInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:22
+ */
+
+@Data
+@ApiModel(value = "合同信息表", description = "")
+public class PmContractInfoReqVo implements Serializable {
+    private static final long serialVersionUID = -59348130033569267L;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("合同编号")
+    private String contractNumber;
+
+
+    @ApiModelProperty("合同名称")
+    private String contractName;
+
+
+    @ApiModelProperty("合同金额（万元）")
+    private Double contractAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("合同终止日期")
+    private Date contractTerminationDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("建设(交付)时间")
+    private Date constructionDeliveryTime;
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+    @ApiModelProperty("甲方信息对象")
+    private PmBaseUnitInformationVo pmBaseUnitInformationVo;
+
+    @ApiModelProperty("乙方信息列表")
+    private List<PmBaseSupplierVo> baseSupplierList;
+
+    /**
+     * 上传附件
+     */
+    @ApiModelProperty("上传附件")
+    private List<SysFileRef> sysFileRefs;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmProjectConstructionReqVo.java

@@ -0,0 +1,65 @@
+package com.ozs.pm.doman.vo.requestVo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目建设表(PmProjectConstruction)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:23
+ */
+
+@Data
+public class PmProjectConstructionReqVo implements Serializable {
+    private static final long serialVersionUID = -98627692890895867L;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("初步验收时间")
+    private Date preliminaryInspectionTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("终验时间")
+    private Date finalInspectionTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 上传附件
+     */
+    @ApiModelProperty("上传附件")
+    private List<SysFileRef> sysFileRefs;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/requestVo/PmReleaseAnnouncementReqVo.java

@@ -37,21 +37,21 @@ public class PmReleaseAnnouncementReqVo implements Serializable {
     @ApiModelProperty("发布公告平台,1:军队采购网,2:全军武器装备采购网")
     private String announcementPlatform;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("发布时间 yyyy-MM-dd")
-    private String releaseTime;
+    private Date releaseTime;
 
 
     @ApiModelProperty("开标地点")
     private String bidOpenPlace;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("报名截止时间 yyyy-MM-dd")
-    private String enrollCloseTime;
-
+    private Date enrollCloseTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("开标时间 yyyy-MM-dd")
-    private String tenderOpenTime;
+    private Date tenderOpenTime;
 
     @ApiModelProperty("备注")
     private String remarks;

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmContractInfoResVo.java

@@ -0,0 +1,81 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.base.domain.BaseUnitInformation;
+import com.ozs.pm.doman.vo.PmBaseSupplierVo;
+import com.ozs.pm.doman.vo.PmBaseUnitInformationVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 合同信息表(PmContractInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:22
+ */
+
+@Data
+@ApiModel(value = "合同信息表", description = "")
+public class PmContractInfoResVo implements Serializable {
+    private static final long serialVersionUID = -59348130033569267L;
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("合同编号")
+    private String contractNumber;
+
+
+    @ApiModelProperty("合同名称")
+    private String contractName;
+
+
+    @ApiModelProperty("合同金额（万元）")
+    private Double contractAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("合同终止日期")
+    private Date contractTerminationDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("建设(交付)时间")
+    private Date constructionDeliveryTime;
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("甲方信息对象")
+    private PmBaseUnitInformationVo pmBaseUnitInformationVo;
+
+    @ApiModelProperty("乙方信息列表")
+    private List<PmBaseSupplierVo> baseSupplierList;
+
+    /**
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmDemandResVo.java

@@ -215,6 +215,17 @@ public class PmDemandResVo extends BaseEntity
     @ApiModelProperty("采购需求工程类对象")
     private PmDemandEngineeringResVo pmDemandEngineeringResVo;
 
+    /** 中标信息对象  */
+    @ApiModelProperty("中标信息对象")
+    private  PmPurchaseExecutionResVo pmPurchaseExecutionResVo;
+
+    /** 合同信息对象  */
+    @ApiModelProperty("合同信息对象")
+    private  PmContractInfoResVo pmContractInfoResVo;
+
+    /** 项目建设对象  */
+    @ApiModelProperty("项目建设对象")
+    private  PmProjectConstructionResVo pmProjectConstructionResVo;
 
     /**
      * 采购需求附件

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmProjectConstructionResVo.java

@@ -0,0 +1,69 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 项目建设表(PmProjectConstruction)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:23
+ */
+
+@Data
+public class PmProjectConstructionResVo implements Serializable {
+    private static final long serialVersionUID = -98627692890895867L;
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("初步验收时间")
+    private Date preliminaryInspectionTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("终验时间")
+    private Date finalInspectionTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmPurchaseExecutionResVo.java

@@ -0,0 +1,45 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+
+import com.ozs.base.domain.BaseAgency;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 中标信息对象
+ *
+ * @author ruoyi
+ * @date 2023-01-16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("中标信息对象")
+public class PmPurchaseExecutionResVo {
+    /** 采购需求ID */
+    @ApiModelProperty("采购需求ID")
+    private Long demandId;
+
+    @ApiModelProperty("招标代理机构信息")
+    private BaseAgency baseAgency;
+
+    @ApiModelProperty("发布公告列表")
+    private List<PmReleaseAnnouncementResVo> pmReleaseAnnouncementResVoList;
+
+    /**
+     *
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+}

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmReleaseAnnouncementResVo.java

@@ -0,0 +1,82 @@
+package com.ozs.pm.doman.vo.responseVo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.system.domain.SysFileRef;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 发布公告表(PmReleaseAnnouncement)实体类
+ *
+ * @author makejava
+ * @since 2023-02-02 00:47:23
+ */
+
+@Data
+@ApiModel(value = "发布公告表", description = "")
+public class PmReleaseAnnouncementResVo implements Serializable {
+    private static final long serialVersionUID = 403614463746791218L;
+
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty("需求ID")
+    private Long demandId;
+
+
+    @ApiModelProperty("发布公告平台,1:军队采购网,2:全军武器装备采购网")
+    private String announcementPlatform;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("发布时间 yyyy-MM-dd")
+    private Date releaseTime;
+
+
+    @ApiModelProperty("开标地点")
+    private String bidOpenPlace;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("报名截止时间 yyyy-MM-dd")
+    private Date enrollCloseTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("开标时间 yyyy-MM-dd")
+    private Date tenderOpenTime;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    /**
+     * 上传附件的URL
+     */
+    @ApiModelProperty("上传附件的URL")
+    HashMap<String, String> fileMap;
+}

purchase-system/src/main/java/com/ozs/pm/mapper/PmBidWinningOpeningRefMapper.java

@@ -0,0 +1,15 @@
+package com.ozs.pm.mapper;
+
+import com.ozs.pm.doman.PmBidWinningOpeningRef;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 中标开标关联表(PmBidWinningOpeningRef)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-02-05 09:44:14
+ */
+public interface PmBidWinningOpeningRefMapper extends BaseMapper<PmBidWinningOpeningRef> {
+
+}

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandEngineeringMapper.java

@@ -1,8 +1,10 @@
 package com.ozs.pm.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import com.ozs.pm.doman.PmDemandEngineering;
 
-import java.util.List;
+
 
 
 /**
@@ -11,39 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface PmDemandEngineeringMapper 
+public interface PmDemandEngineeringMapper extends BaseMapper<PmDemandEngineering>
 {
-    /**
-     * 查询采购需求工程类
-     * 
-     * @param demandEngineeringId 采购需求工程类主键
-     * @return 采购需求工程类
-     */
-    public PmDemandEngineering selectPmDemandEngineeringByDemandEngineeringId(Long demandEngineeringId);
-
-    /**
-     * 查询采购需求工程类列表
-     * 
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 采购需求工程类集合
-     */
-    public List<PmDemandEngineering> selectPmDemandEngineeringList(PmDemandEngineering pmDemandEngineering);
-
-    /**
-     * 新增采购需求工程类
-     * 
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 结果
-     */
-    public int insertPmDemandEngineering(PmDemandEngineering pmDemandEngineering);
-
-    /**
-     * 修改采购需求工程类
-     * 
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 结果
-     */
-    public int updatePmDemandEngineering(PmDemandEngineering pmDemandEngineering);
-
 
 }

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandEquipMapper.java

@@ -1,8 +1,8 @@
 package com.ozs.pm.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.pm.doman.PmDemandEquip;
 
-import java.util.List;
 
 
 /**
@@ -11,39 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface PmDemandEquipMapper 
+public interface PmDemandEquipMapper extends BaseMapper<PmDemandEquip>
 {
-    /**
-     * 查询采购需求装备类
-     * 
-     * @param demandEquipId 采购需求装备类主键
-     * @return 采购需求装备类
-     */
-    public PmDemandEquip selectPmDemandEquipByDemandEquipId(Long demandEquipId);
-
-    /**
-     * 查询采购需求装备类列表
-     * 
-     * @param pmDemandEquip 采购需求装备类
-     * @return 采购需求装备类集合
-     */
-    public List<PmDemandEquip> selectPmDemandEquipList(PmDemandEquip pmDemandEquip);
-
-    /**
-     * 新增采购需求装备类
-     * 
-     * @param pmDemandEquip 采购需求装备类
-     * @return 结果
-     */
-    public int insertPmDemandEquip(PmDemandEquip pmDemandEquip);
-
-    /**
-     * 修改采购需求装备类
-     * 
-     * @param pmDemandEquip 采购需求装备类
-     * @return 结果
-     */
-    public int updatePmDemandEquip(PmDemandEquip pmDemandEquip);
-
 
 }

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

@@ -1,8 +1,7 @@
 package com.ozs.pm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.plan.doman.PlanYears;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import com.ozs.pm.doman.PmDemand;
 import org.apache.ibatis.annotations.Param;
 

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMaterialsMapper.java

@@ -1,8 +1,9 @@
 package com.ozs.pm.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import com.ozs.pm.doman.PmDemandMaterials;
 
-import java.util.List;
 
 
 /**
@@ -11,39 +12,6 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface PmDemandMaterialsMapper 
+public interface PmDemandMaterialsMapper extends BaseMapper<PmDemandMaterials>
 {
-    /**
-     * 查询采购需求物资类
-     * 
-     * @param demandMaterialsId 采购需求物资类主键
-     * @return 采购需求物资类
-     */
-    public PmDemandMaterials selectPmDemandMaterialsByDemandMaterialsId(Long demandMaterialsId);
-
-    /**
-     * 查询采购需求物资类列表
-     * 
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 采购需求物资类集合
-     */
-    public List<PmDemandMaterials> selectPmDemandMaterialsList(PmDemandMaterials pmDemandMaterials);
-
-    /**
-     * 新增采购需求物资类
-     * 
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 结果
-     */
-    public int insertPmDemandMaterials(PmDemandMaterials pmDemandMaterials);
-
-    /**
-     * 修改采购需求物资类
-     * 
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 结果
-     */
-    public int updatePmDemandMaterials(PmDemandMaterials pmDemandMaterials);
-
-
 }

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandServeMapper.java

@@ -1,8 +1,9 @@
 package com.ozs.pm.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import com.ozs.pm.doman.PmDemandServe;
 
-import java.util.List;
 
 /**
  * 采购需求服务类Mapper接口
@@ -10,39 +11,6 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface PmDemandServeMapper 
+public interface PmDemandServeMapper extends BaseMapper<PmDemandServe>
 {
-    /**
-     * 查询采购需求服务类
-     * 
-     * @param demandServeId 采购需求服务类主键
-     * @return 采购需求服务类
-     */
-    public PmDemandServe selectPmDemandServeByDemandServeId(Long demandServeId);
-
-    /**
-     * 查询采购需求服务类列表
-     * 
-     * @param pmDemandServe 采购需求服务类
-     * @return 采购需求服务类集合
-     */
-    public List<PmDemandServe> selectPmDemandServeList(PmDemandServe pmDemandServe);
-
-    /**
-     * 新增采购需求服务类
-     * 
-     * @param pmDemandServe 采购需求服务类
-     * @return 结果
-     */
-    public int insertPmDemandServe(PmDemandServe pmDemandServe);
-
-    /**
-     * 修改采购需求服务类
-     * 
-     * @param pmDemandServe 采购需求服务类
-     * @return 结果
-     */
-    public int updatePmDemandServe(PmDemandServe pmDemandServe);
-
-
 }

purchase-system/src/main/java/com/ozs/pm/mapper/PmFlowChartMapper.java

@@ -1,8 +1,8 @@
 package com.ozs.pm.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.pm.doman.PmFlowChart;
 
-import java.util.List;
 
 
 /**
@@ -11,53 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-25
  */
-public interface PmFlowChartMapper 
+public interface PmFlowChartMapper extends BaseMapper<PmFlowChart>
 {
-    /**
-     * 查询流程图
-     * 
-     * @param flowChartId 流程图主键
-     * @return 流程图
-     */
-    public PmFlowChart selectPmFlowChartByFlowChartId(Long flowChartId);
 
-    /**
-     * 查询流程图列表
-     * 
-     * @param pmFlowChart 流程图
-     * @return 流程图集合
-     */
-    public List<PmFlowChart> selectPmFlowChartList(PmFlowChart pmFlowChart);
-
-    /**
-     * 新增流程图
-     * 
-     * @param pmFlowChart 流程图
-     * @return 结果
-     */
-    public int insertPmFlowChart(PmFlowChart pmFlowChart);
-
-    /**
-     * 修改流程图
-     * 
-     * @param pmFlowChart 流程图
-     * @return 结果
-     */
-    public int updatePmFlowChart(PmFlowChart pmFlowChart);
-
-    /**
-     * 删除流程图
-     * 
-     * @param flowChartId 流程图主键
-     * @return 结果
-     */
-    public int deletePmFlowChartByFlowChartId(Long flowChartId);
-
-    /**
-     * 批量删除流程图
-     * 
-     * @param flowChartIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePmFlowChartByFlowChartIds(Long[] flowChartIds);
 }

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandEngineeringService.java

@@ -1,8 +1,10 @@
 package com.ozs.pm.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.ozs.pm.doman.PmDemandEngineering;
 
-import java.util.List;
+
 
 
 /**
@@ -11,38 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface IPmDemandEngineeringService 
+public interface IPmDemandEngineeringService  extends IService<PmDemandEngineering>
 {
-    /**
-     * 查询采购需求工程类
-     * 
-     * @param demandEngineeringId 采购需求工程类主键
-     * @return 采购需求工程类
-     */
-    public PmDemandEngineering selectPmDemandEngineeringByDemandEngineeringId(Long demandEngineeringId);
-
-    /**
-     * 查询采购需求工程类列表
-     * 
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 采购需求工程类集合
-     */
-    public List<PmDemandEngineering> selectPmDemandEngineeringList(PmDemandEngineering pmDemandEngineering);
-
-    /**
-     * 新增采购需求工程类
-     * 
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 结果
-     */
-    public int insertPmDemandEngineering(PmDemandEngineering pmDemandEngineering);
-
-    /**
-     * 修改采购需求工程类
-     * 
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 结果
-     */
-    public int updatePmDemandEngineering(PmDemandEngineering pmDemandEngineering);
 
 }

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandEquipService.java

@@ -1,8 +1,8 @@
 package com.ozs.pm.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.pm.doman.PmDemandEquip;
 
-import java.util.List;
 
 /**
  * 采购需求装备类Service接口
@@ -10,38 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface IPmDemandEquipService 
+public interface IPmDemandEquipService extends IService<PmDemandEquip>
 {
-    /**
-     * 查询采购需求装备类
-     * 
-     * @param demandEquipId 采购需求装备类主键
-     * @return 采购需求装备类
-     */
-    public PmDemandEquip selectPmDemandEquipByDemandEquipId(Long demandEquipId);
-
-    /**
-     * 查询采购需求装备类列表
-     * 
-     * @param pmDemandEquip 采购需求装备类
-     * @return 采购需求装备类集合
-     */
-    public List<PmDemandEquip> selectPmDemandEquipList(PmDemandEquip pmDemandEquip);
-
-    /**
-     * 新增采购需求装备类
-     * 
-     * @param pmDemandEquip 采购需求装备类
-     * @return 结果
-     */
-    public int insertPmDemandEquip(PmDemandEquip pmDemandEquip);
-
-    /**
-     * 修改采购需求装备类
-     * 
-     * @param pmDemandEquip 采购需求装备类
-     * @return 结果
-     */
-    public int updatePmDemandEquip(PmDemandEquip pmDemandEquip);
 
 }

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandMaterialsService.java

@@ -1,8 +1,8 @@
 package com.ozs.pm.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.pm.doman.PmDemandMaterials;
 
-import java.util.List;
 
 /**
  * 采购需求物资类Service接口
@@ -10,39 +10,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface IPmDemandMaterialsService 
+public interface IPmDemandMaterialsService extends IService<PmDemandMaterials>
 {
-    /**
-     * 查询采购需求物资类
-     * 
-     * @param demandMaterialsId 采购需求物资类主键
-     * @return 采购需求物资类
-     */
-    public PmDemandMaterials selectPmDemandMaterialsByDemandMaterialsId(Long demandMaterialsId);
-
-    /**
-     * 查询采购需求物资类列表
-     * 
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 采购需求物资类集合
-     */
-    public List<PmDemandMaterials> selectPmDemandMaterialsList(PmDemandMaterials pmDemandMaterials);
-
-    /**
-     * 新增采购需求物资类
-     * 
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 结果
-     */
-    public int insertPmDemandMaterials(PmDemandMaterials pmDemandMaterials);
-
-    /**
-     * 修改采购需求物资类
-     * 
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 结果
-     */
-    public int updatePmDemandMaterials(PmDemandMaterials pmDemandMaterials);
-
 
 }

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandServeService.java

@@ -1,8 +1,9 @@
 package com.ozs.pm.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.ozs.pm.doman.PmDemandServe;
 
-import java.util.List;
 
 
 /**
@@ -11,39 +12,8 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-16
  */
-public interface IPmDemandServeService 
+public interface IPmDemandServeService extends IService<PmDemandServe>
 {
-    /**
-     * 查询采购需求服务类
-     * 
-     * @param demandServeId 采购需求服务类主键
-     * @return 采购需求服务类
-     */
-    public PmDemandServe selectPmDemandServeByDemandServeId(Long demandServeId);
-
-    /**
-     * 查询采购需求服务类列表
-     * 
-     * @param pmDemandServe 采购需求服务类
-     * @return 采购需求服务类集合
-     */
-    public List<PmDemandServe> selectPmDemandServeList(PmDemandServe pmDemandServe);
-
-    /**
-     * 新增采购需求服务类
-     * 
-     * @param pmDemandServe 采购需求服务类
-     * @return 结果
-     */
-    public int insertPmDemandServe(PmDemandServe pmDemandServe);
-
-    /**
-     * 修改采购需求服务类
-     * 
-     * @param pmDemandServe 采购需求服务类
-     * @return 结果
-     */
-    public int updatePmDemandServe(PmDemandServe pmDemandServe);
 
 
 }

purchase-system/src/main/java/com/ozs/pm/service/IPmDemandService.java

@@ -3,12 +3,8 @@ package com.ozs.pm.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.base.domain.BaseExpert;
 import com.ozs.pm.doman.PmDemand;
-import com.ozs.pm.doman.vo.requestVo.PmBaseExpertReqVo;
-import com.ozs.pm.doman.vo.requestVo.PmBookBuildingReqVo;
-import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
-import com.ozs.pm.doman.vo.requestVo.PmReleaseAnnouncementReqVo;
+import com.ozs.pm.doman.vo.requestVo.*;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
 import com.ozs.pm.doman.vo.responseVo.PmFlowChartResVo;
 import com.ozs.system.domain.SysFileRef;
@@ -30,7 +26,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param demandId 采购需求主键
      * @return 采购需求
      */
-    public PmDemandResVo selectPmDemandByDemandId(Long demandId,String detailType);
+    PmDemandResVo selectPmDemandByDemandId(Long demandId,String detailType);
 
     /**
      * 查询采购需求列表
@@ -38,31 +34,16 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param pmDemandReqVo 采购需求
      * @return 采购需求集合
      */
-    public IPage<PmDemandResVo> selectPmDemandList(PmDemandReqVo pmDemandReqVo,int reqType);
+    IPage<PmDemandResVo> selectPmDemandList(PmDemandReqVo pmDemandReqVo,int reqType);
 
 
-    /**
-     * 新增采购需求
-     * 
-     * @param pmDemand 采购需求
-     * @return 结果
-     */
-    public int insertPmDemand(PmDemand pmDemand);
-    /**
-     *修改采购需求
-     *
-     * @param pmDemand 采购需求
-     * @return 结果
-     */
-    public int updatePmDemand(PmDemand pmDemand);
-
     /**
      * 需求建档
      * 
      * @param pmBookBuildingReqVo 需求建档
      * @return 结果
      */
-    public int bookBuilding(PmBookBuildingReqVo pmBookBuildingReqVo);
+    boolean bookBuilding(PmBookBuildingReqVo pmBookBuildingReqVo);
 
     /**
      * 查看流程图
@@ -70,7 +51,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param demandId 采购需求主键
      * @return 采购需求
      */
-    public Object viewFlowChart(Long demandId);
+    Object viewFlowChart(Long demandId);
 
     /**
      * 查看流程图
@@ -78,7 +59,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param demandId 采购需求主键
      * @return 采购需求
      */
-    public PmFlowChartResVo getModuleInfo(Long demandId, String moduleName);
+    PmFlowChartResVo getModuleInfo(Long demandId, String moduleName);
 
     /**
      * 提交采购需求
@@ -86,7 +67,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param pmDemandReqVo
      * @return 结果
      */
-    public int commit(PmDemandReqVo pmDemandReqVo);
+    boolean commit(PmDemandReqVo pmDemandReqVo);
 
     /**
      * 审核采购需求通过
@@ -94,7 +75,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param pmDemandReqVo
      * @return 结果
      */
-    public int reviewTo(PmDemandReqVo pmDemandReqVo);
+    boolean reviewTo(PmDemandReqVo pmDemandReqVo);
 
     /**
      * 审核采购需求退回
@@ -102,7 +83,7 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param pmDemandReqVo
      * @return 结果
      */
-    public int reviewReturn(PmDemandReqVo pmDemandReqVo);
+    boolean reviewReturn(PmDemandReqVo pmDemandReqVo);
 
     /**
      * 下达任务
@@ -110,13 +91,27 @@ public interface IPmDemandService extends IService<PmDemand>
      * @param pmDemandReqVo
      * @return 结果
      */
-    public int releaseTask(PmDemandReqVo pmDemandReqVo);
+    boolean releaseTask(PmDemandReqVo pmDemandReqVo);
 
     boolean uploadFile(Long redId,Integer fileType, List<SysFileRef> sysFileRefs,String upateBy);
 
-    boolean insertPmReleaseAnnouncement(PmReleaseAnnouncementReqVo pmReleaseAnnouncementReqVo);
+    boolean insertPmReleaseAnnouncement(PmReleaseAnnouncementReqVo pmReleaseAnnouncementReqVo) throws Exception;
+
+    boolean insertExpertBatch(PmBaseExpertFillReqVo pmBaseExpertFillReqVo) throws Exception;
+
+    boolean extractExpertBatch(PmBaseExpertExtractReqVo pmBaseExpertExtractReqVo) throws Exception;
+
+    boolean insertBidOpeningBatch(PmBidOpeningFillReqVo pmBidOpeningFillReqVo) throws Exception;
+
+    boolean insertPmBidWinning(PmBidWinningReqVo pmBidWinningReqVo) throws Exception;
+
+    boolean updatePmBidWinning(PmBidWinningReqVo pmBidWinningReqVo) throws Exception;
+
+    boolean insertPmBidFailure(PmBidFailureReqVo pmBidFailureReqVo) throws Exception;
+
+    boolean insertContractInfo(PmContractInfoReqVo pmContractInfoReqVo) throws Exception;
 
-    boolean insertExpertBatch(PmBaseExpertReqVo pmBaseExpertReqVo) throws Exception;
+    boolean insertProjectConstruction(PmProjectConstructionReqVo pmProjectConstructionReqVo) throws Exception;
 
     /**
      * 通过需求ID列表 查询采购执行列表 sunhh

purchase-system/src/main/java/com/ozs/pm/service/IPmFlowChartService.java

@@ -1,8 +1,10 @@
 package com.ozs.pm.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.ozs.pm.doman.PmFlowChart;
 
-import java.util.List;
+
 
 
 /**
@@ -11,53 +13,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-01-25
  */
-public interface IPmFlowChartService 
+public interface IPmFlowChartService extends IService<PmFlowChart>
 {
-    /**
-     * 查询流程图
-     * 
-     * @param flowChartId 流程图主键
-     * @return 流程图
-     */
-    public PmFlowChart selectPmFlowChartByFlowChartId(Long flowChartId);
-
-    /**
-     * 查询流程图列表
-     * 
-     * @param pmFlowChart 流程图
-     * @return 流程图集合
-     */
-    public List<PmFlowChart> selectPmFlowChartList(PmFlowChart pmFlowChart);
-
-    /**
-     * 新增流程图
-     * 
-     * @param pmFlowChart 流程图
-     * @return 结果
-     */
-    public int insertPmFlowChart(PmFlowChart pmFlowChart);
-
-    /**
-     * 修改流程图
-     * 
-     * @param pmFlowChart 流程图
-     * @return 结果
-     */
-    public int updatePmFlowChart(PmFlowChart pmFlowChart);
-
-    /**
-     * 批量删除流程图
-     * 
-     * @param flowChartIds 需要删除的流程图主键集合
-     * @return 结果
-     */
-    public int deletePmFlowChartByFlowChartIds(Long[] flowChartIds);
 
-    /**
-     * 删除流程图信息
-     * 
-     * @param flowChartId 流程图主键
-     * @return 结果
-     */
-    public int deletePmFlowChartByFlowChartId(Long flowChartId);
 }

purchase-system/src/main/java/com/ozs/pm/service/PmBidWinningOpeningRefService.java

@@ -0,0 +1,14 @@
+package com.ozs.pm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.pm.doman.PmBidWinningOpeningRef;
+
+/**
+ * 中标开标关联表(PmBidWinningOpeningRef)表服务接口
+ *
+ * @author makejava
+ * @since 2023-02-05 09:44:14
+ */
+public interface PmBidWinningOpeningRefService extends IService<PmBidWinningOpeningRef> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.ozs.pm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.pm.mapper.PmBidWinningOpeningRefMapper;
+import com.ozs.pm.doman.PmBidWinningOpeningRef;
+import com.ozs.pm.service.PmBidWinningOpeningRefService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 中标开标关联表(PmBidWinningOpeningRef)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-02-05 09:44:14
+ */
+@Service
+public class PmBidWinningOpeningRefServiceImpl extends ServiceImpl<PmBidWinningOpeningRefMapper, PmBidWinningOpeningRef> implements PmBidWinningOpeningRefService {
+
+}

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

@@ -1,11 +1,11 @@
 package com.ozs.pm.service.impl;
 
-import java.util.List;
-import com.ozs.common.utils.DateUtils;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.pm.doman.PmDemandEngineering;
 import com.ozs.pm.mapper.PmDemandEngineeringMapper;
 import com.ozs.pm.service.IPmDemandEngineeringService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -16,59 +16,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-01-16
  */
 @Service
-public class PmDemandEngineeringServiceImpl implements IPmDemandEngineeringService
+public class PmDemandEngineeringServiceImpl extends ServiceImpl<PmDemandEngineeringMapper, PmDemandEngineering> implements IPmDemandEngineeringService
 {
-    @Autowired
-    private PmDemandEngineeringMapper pmDemandEngineeringMapper;
-
-    /**
-     * 查询采购需求工程类
-     *
-     * @param demandEngineeringId 采购需求工程类主键
-     * @return 采购需求工程类
-     */
-    @Override
-    public PmDemandEngineering selectPmDemandEngineeringByDemandEngineeringId(Long demandEngineeringId)
-    {
-        return pmDemandEngineeringMapper.selectPmDemandEngineeringByDemandEngineeringId(demandEngineeringId);
-    }
-
-    /**
-     * 查询采购需求工程类列表
-     *
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 采购需求工程类
-     */
-    @Override
-    public List<PmDemandEngineering> selectPmDemandEngineeringList(PmDemandEngineering pmDemandEngineering)
-    {
-        return pmDemandEngineeringMapper.selectPmDemandEngineeringList(pmDemandEngineering);
-    }
-
-    /**
-     * 新增采购需求工程类
-     *
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 结果
-     */
-    @Override
-    public int insertPmDemandEngineering(PmDemandEngineering pmDemandEngineering)
-    {
-        pmDemandEngineering.setCreateTime(DateUtils.getNowDate());
-        return pmDemandEngineeringMapper.insertPmDemandEngineering(pmDemandEngineering);
-    }
-
-    /**
-     * 修改采购需求工程类
-     *
-     * @param pmDemandEngineering 采购需求工程类
-     * @return 结果
-     */
-    @Override
-    public int updatePmDemandEngineering(PmDemandEngineering pmDemandEngineering)
-    {
-        pmDemandEngineering.setUpdateTime(DateUtils.getNowDate());
-        return pmDemandEngineeringMapper.updatePmDemandEngineering(pmDemandEngineering);
-    }
-
 }

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

@@ -1,11 +1,11 @@
 package com.ozs.pm.service.impl;
 
-import java.util.List;
-import com.ozs.common.utils.DateUtils;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.pm.doman.PmDemandEquip;
 import com.ozs.pm.mapper.PmDemandEquipMapper;
 import com.ozs.pm.service.IPmDemandEquipService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -16,60 +16,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-01-16
  */
 @Service
-public class PmDemandEquipServiceImpl implements IPmDemandEquipService
+public class PmDemandEquipServiceImpl extends ServiceImpl<PmDemandEquipMapper, PmDemandEquip> implements IPmDemandEquipService
 {
-    @Autowired
-    private PmDemandEquipMapper pmDemandEquipMapper;
-
-    /**
-     * 查询采购需求装备类
-     *
-     * @param demandEquipId 采购需求装备类主键
-     * @return 采购需求装备类
-     */
-    @Override
-    public PmDemandEquip selectPmDemandEquipByDemandEquipId(Long demandEquipId)
-    {
-        return pmDemandEquipMapper.selectPmDemandEquipByDemandEquipId(demandEquipId);
-    }
-
-    /**
-     * 查询采购需求装备类列表
-     *
-     * @param pmDemandEquip 采购需求装备类
-     * @return 采购需求装备类
-     */
-    @Override
-    public List<PmDemandEquip> selectPmDemandEquipList(PmDemandEquip pmDemandEquip)
-    {
-        return pmDemandEquipMapper.selectPmDemandEquipList(pmDemandEquip);
-    }
-
-    /**
-     * 新增采购需求装备类
-     *
-     * @param pmDemandEquip 采购需求装备类
-     * @return 结果
-     */
-    @Override
-    public int insertPmDemandEquip(PmDemandEquip pmDemandEquip)
-    {
-        pmDemandEquip.setCreateTime(DateUtils.getNowDate());
-        return pmDemandEquipMapper.insertPmDemandEquip(pmDemandEquip);
-    }
-
-    /**
-     * 修改采购需求装备类
-     *
-     * @param pmDemandEquip 采购需求装备类
-     * @return 结果
-     */
-    @Override
-    public int updatePmDemandEquip(PmDemandEquip pmDemandEquip)
-    {
-        pmDemandEquip.setUpdateTime(DateUtils.getNowDate());
-        return pmDemandEquipMapper.updatePmDemandEquip(pmDemandEquip);
-    }
-
 
 }

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

@@ -1,11 +1,11 @@
 package com.ozs.pm.service.impl;
 
-import java.util.List;
-import com.ozs.common.utils.DateUtils;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.pm.doman.PmDemandMaterials;
 import com.ozs.pm.mapper.PmDemandMaterialsMapper;
 import com.ozs.pm.service.IPmDemandMaterialsService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -16,59 +16,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-01-16
  */
 @Service
-public class PmDemandMaterialsServiceImpl implements IPmDemandMaterialsService
+public class PmDemandMaterialsServiceImpl  extends ServiceImpl<PmDemandMaterialsMapper, PmDemandMaterials> implements IPmDemandMaterialsService
 {
-    @Autowired
-    private PmDemandMaterialsMapper pmDemandMaterialsMapper;
-
-    /**
-     * 查询采购需求物资类
-     *
-     * @param demandMaterialsId 采购需求物资类主键
-     * @return 采购需求物资类
-     */
-    @Override
-    public PmDemandMaterials selectPmDemandMaterialsByDemandMaterialsId(Long demandMaterialsId)
-    {
-        return pmDemandMaterialsMapper.selectPmDemandMaterialsByDemandMaterialsId(demandMaterialsId);
-    }
-
-    /**
-     * 查询采购需求物资类列表
-     *
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 采购需求物资类
-     */
-    @Override
-    public List<PmDemandMaterials> selectPmDemandMaterialsList(PmDemandMaterials pmDemandMaterials)
-    {
-        return pmDemandMaterialsMapper.selectPmDemandMaterialsList(pmDemandMaterials);
-    }
-
-    /**
-     * 新增采购需求物资类
-     *
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 结果
-     */
-    @Override
-    public int insertPmDemandMaterials(PmDemandMaterials pmDemandMaterials)
-    {
-        pmDemandMaterials.setCreateTime(DateUtils.getNowDate());
-        return pmDemandMaterialsMapper.insertPmDemandMaterials(pmDemandMaterials);
-    }
-
-    /**
-     * 修改采购需求物资类
-     *
-     * @param pmDemandMaterials 采购需求物资类
-     * @return 结果
-     */
-    @Override
-    public int updatePmDemandMaterials(PmDemandMaterials pmDemandMaterials)
-    {
-        pmDemandMaterials.setUpdateTime(DateUtils.getNowDate());
-        return pmDemandMaterialsMapper.updatePmDemandMaterials(pmDemandMaterials);
-    }
-
 }

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

@@ -1,11 +1,10 @@
 package com.ozs.pm.service.impl;
 
-import java.util.List;
-import com.ozs.common.utils.DateUtils;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.pm.doman.PmDemandServe;
 import com.ozs.pm.mapper.PmDemandServeMapper;
 import com.ozs.pm.service.IPmDemandServeService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -16,60 +15,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-01-16
  */
 @Service
-public class PmDemandServeServiceImpl implements IPmDemandServeService
+public class PmDemandServeServiceImpl extends ServiceImpl<PmDemandServeMapper, PmDemandServe> implements IPmDemandServeService
 {
-    @Autowired
-    private PmDemandServeMapper pmDemandServeMapper;
-
-    /**
-     * 查询采购需求服务类
-     *
-     * @param demandServeId 采购需求服务类主键
-     * @return 采购需求服务类
-     */
-    @Override
-    public PmDemandServe selectPmDemandServeByDemandServeId(Long demandServeId)
-    {
-        return pmDemandServeMapper.selectPmDemandServeByDemandServeId(demandServeId);
-    }
-
-    /**
-     * 查询采购需求服务类列表
-     *
-     * @param pmDemandServe 采购需求服务类
-     * @return 采购需求服务类
-     */
-    @Override
-    public List<PmDemandServe> selectPmDemandServeList(PmDemandServe pmDemandServe)
-    {
-        return pmDemandServeMapper.selectPmDemandServeList(pmDemandServe);
-    }
-
-    /**
-     * 新增采购需求服务类
-     *
-     * @param pmDemandServe 采购需求服务类
-     * @return 结果
-     */
-    @Override
-    public int insertPmDemandServe(PmDemandServe pmDemandServe)
-    {
-        pmDemandServe.setCreateTime(DateUtils.getNowDate());
-        return pmDemandServeMapper.insertPmDemandServe(pmDemandServe);
-    }
-
-    /**
-     * 修改采购需求服务类
-     *
-     * @param pmDemandServe 采购需求服务类
-     * @return 结果
-     */
-    @Override
-    public int updatePmDemandServe(PmDemandServe pmDemandServe)
-    {
-        pmDemandServe.setUpdateTime(DateUtils.getNowDate());
-        return pmDemandServeMapper.updatePmDemandServe(pmDemandServe);
-    }
-
 
 }

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

@@ -1,11 +1,11 @@
 package com.ozs.pm.service.impl;
 
-import java.util.List;
-import com.ozs.common.utils.DateUtils;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.pm.doman.PmFlowChart;
+
 import com.ozs.pm.mapper.PmFlowChartMapper;
 import com.ozs.pm.service.IPmFlowChartService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -16,82 +16,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-01-25
  */
 @Service
-public class PmFlowChartServiceImpl implements IPmFlowChartService
+public class PmFlowChartServiceImpl extends ServiceImpl<PmFlowChartMapper, PmFlowChart> implements IPmFlowChartService
 {
-    @Autowired
-    private PmFlowChartMapper pmFlowChartMapper;
-
-    /**
-     * 查询流程图
-     *
-     * @param flowChartId 流程图主键
-     * @return 流程图
-     */
-    @Override
-    public PmFlowChart selectPmFlowChartByFlowChartId(Long flowChartId)
-    {
-        return pmFlowChartMapper.selectPmFlowChartByFlowChartId(flowChartId);
-    }
-
-    /**
-     * 查询流程图列表
-     *
-     * @param pmFlowChart 流程图
-     * @return 流程图
-     */
-    @Override
-    public List<PmFlowChart> selectPmFlowChartList(PmFlowChart pmFlowChart)
-    {
-        return pmFlowChartMapper.selectPmFlowChartList(pmFlowChart);
-    }
-
-    /**
-     * 新增流程图
-     *
-     * @param pmFlowChart 流程图
-     * @return 结果
-     */
-    @Override
-    public int insertPmFlowChart(PmFlowChart pmFlowChart)
-    {
-        pmFlowChart.setCreateTime(DateUtils.getNowDate());
-        return pmFlowChartMapper.insertPmFlowChart(pmFlowChart);
-    }
-
-    /**
-     * 修改流程图
-     *
-     * @param pmFlowChart 流程图
-     * @return 结果
-     */
-    @Override
-    public int updatePmFlowChart(PmFlowChart pmFlowChart)
-    {
-        pmFlowChart.setUpdateTime(DateUtils.getNowDate());
-        return pmFlowChartMapper.updatePmFlowChart(pmFlowChart);
-    }
-
-    /**
-     * 批量删除流程图
-     *
-     * @param flowChartIds 需要删除的流程图主键
-     * @return 结果
-     */
-    @Override
-    public int deletePmFlowChartByFlowChartIds(Long[] flowChartIds)
-    {
-        return pmFlowChartMapper.deletePmFlowChartByFlowChartIds(flowChartIds);
-    }
 
-    /**
-     * 删除流程图信息
-     *
-     * @param flowChartId 流程图主键
-     * @return 结果
-     */
-    @Override
-    public int deletePmFlowChartByFlowChartId(Long flowChartId)
-    {
-        return pmFlowChartMapper.deletePmFlowChartByFlowChartId(flowChartId);
-    }
 }

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

@@ -125,6 +125,13 @@
           and del_flay = 0
     </select>
 
+    <select id="getByPlanYearId" resultType="com.ozs.plan.doman.PlanQuarter" parameterType="java.lang.Long">
+        select *
+        from plan_practical
+        where plan_year_id = #{planYearId}
+          and del_flay = 0
+    </select>
+
     <select id="countProjectNameOther" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(plan_practical.plan_practical_id)
         from plan_practical
@@ -136,13 +143,15 @@
 
     <!--	创建计划信息-->
     <insert id="insertPlanQuarter" parameterType="com.ozs.plan.doman.PlanQuarter" useGeneratedKeys="true"
-            keyProperty="planYearId">
-        insert into plan_practical (purchase_dept_id, project_name, project_type, demand_overview, evaluation,
+            keyProperty="planPracticalId">
+        insert into plan_practical (purchase_dept_id, plan_year_id, project_name, project_type, demand_overview,
+                                    evaluation,
                                     is_excess,
                                     purchase_services, purchase_mode, plan_demand_sub_time, plan_purchase_finish_time,
                                     plan_deliver_time, project_attr, adjust_reason, remarks, project_status,
                                     created, create_time, del_flay, plan_type, send_letter)
-        values (#{purchaseDeptId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation}, #{isExcess},
+        values (#{purchaseDeptId}, #{planYearId}, #{projectName}, #{projectType}, #{demandOverview}, #{evaluation},
+                #{isExcess},
                 #{purchaseServices}, #{purchaseMode}, #{planDemandSubTime}, #{planPurchaseFinishTime},
                 #{planDeliverTime},
                 #{projectAttr}, #{adjustReason}, #{remarks}, #{projectStatus}, #{created}, #{createTime}, 0, 0, 0)
@@ -170,14 +179,17 @@
     </update>
 
     <!--	计划审核-->
-    <update id="review" parameterType="com.ozs.plan.doman.PlanQuarter">
+    <update id="review" parameterType="com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo">
         update plan_practical
         <set>
             <if test="refuseReason != null and refuseReason != ''">
                 refuse_reason=#{refuseReason},
             </if>
             <if test="projectStatus != null and projectStatus != ''">
-                project_status=#{projectStatus}
+                project_status=#{projectStatus},
+            </if>
+            <if test="adjustReason != null and adjustReason != ''">
+                adjust_reason=#{adjustReason}
             </if>
         </set>
         where plan_practical_id = #{planPracticalId}

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

@@ -162,10 +162,19 @@
 	</update>
 
 	<!--	计划审核-->
-	<update id="review" parameterType="com.ozs.plan.doman.PlanYears">
+	<update id="review" parameterType="com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo">
 		update plan_years
-		set refuse_reason=#{refuseReason},
-			project_status=#{projectStatus}
+		<set>
+			<if test="refuseReason != null and refuseReason != ''">
+				refuse_reason=#{refuseReason},
+			</if>
+			<if test="projectStatus != null and projectStatus != ''">
+				project_status=#{projectStatus},
+			</if>
+			<if test="adjustReason != null and adjustReason != ''">
+				adjust_reason=#{adjustReason}
+			</if>
+		</set>
 		where plan_year_id = #{planYearId}
 	</update>
 

purchase-system/src/main/resources/mapper/pm/PmBidWinningOpeningRefMapper.xml

@@ -0,0 +1,6 @@
+<?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.pm.mapper.PmBidWinningOpeningRefMapper">
+
+
+</mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandEquipMapper.xml

@@ -3,110 +3,5 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.pm.mapper.PmDemandEquipMapper">
-    
-    <resultMap type="com.ozs.pm.doman.PmDemandEquip" id="PmDemandEquipResult">
-        <result property="demandEquipId"    column="demand_equip_id"    />
-        <result property="demandId"    column="demand_id"    />
-        <result property="typeAndName"    column="type_and_name"    />
-        <result property="specification"    column="specification"    />
-        <result property="qualityTechnicalStandard"    column="quality_technical_standard"    />
-        <result property="measurementUnit"    column="measurement_unit"    />
-        <result property="procurementQuantity"    column="procurement_quantity"    />
-        <result property="price"    column="price"    />
-        <result property="budgetAmount"    column="budget_amount"    />
-        <result property="demandCommitTime"    column="demand_commit_time"    />
-        <result property="procurementMethodSuggest"    column="procurement_method_suggest"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectPmDemandEquipVo">
-        select demand_equip_id, demand_id, type_and_name, specification, quality_technical_standard, measurement_unit, procurement_quantity, price, budget_amount, demand_commit_time, procurement_method_suggest, remarks, create_by, create_time, update_by, update_time from pm_demand_equip
-    </sql>
-
-    <select id="selectPmDemandEquipList" parameterType="com.ozs.pm.doman.PmDemandEquip" resultMap="PmDemandEquipResult">
-        <include refid="selectPmDemandEquipVo"/>
-        <where>  
-            <if test="demandId != null "> and demand_id = #{demandId}</if>
-            <if test="typeAndName != null  and typeAndName != ''"> and type_and_name like concat('%', #{typeAndName}, '%')</if>
-            <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
-            <if test="qualityTechnicalStandard != null  and qualityTechnicalStandard != ''"> and quality_technical_standard = #{qualityTechnicalStandard}</if>
-            <if test="measurementUnit != null  and measurementUnit != ''"> and measurement_unit = #{measurementUnit}</if>
-            <if test="procurementQuantity != null "> and procurement_quantity = #{procurementQuantity}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="budgetAmount != null "> and budget_amount = #{budgetAmount}</if>
-            <if test="demandCommitTime != null "> and demand_commit_time = #{demandCommitTime}</if>
-            <if test="procurementMethodSuggest != null  and procurementMethodSuggest != ''"> and procurement_method_suggest = #{procurementMethodSuggest}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-        </where>
-    </select>
-    
-    <select id="selectPmDemandEquipByDemandEquipId" parameterType="Long" resultMap="PmDemandEquipResult">
-        <include refid="selectPmDemandEquipVo"/>
-        where demand_equip_id = #{demandEquipId}
-    </select>
-        
-    <insert id="insertPmDemandEquip" parameterType="com.ozs.pm.doman.PmDemandEquip" useGeneratedKeys="true" keyProperty="demandEquipId">
-        insert into pm_demand_equip
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="demandId != null">demand_id,</if>
-            <if test="typeAndName != null">type_and_name,</if>
-            <if test="specification != null">specification,</if>
-            <if test="qualityTechnicalStandard != null">quality_technical_standard,</if>
-            <if test="measurementUnit != null and measurementUnit != ''">measurement_unit,</if>
-            <if test="procurementQuantity != null">procurement_quantity,</if>
-            <if test="price != null">price,</if>
-            <if test="budgetAmount != null">budget_amount,</if>
-            <if test="demandCommitTime != null">demand_commit_time,</if>
-            <if test="procurementMethodSuggest != null">procurement_method_suggest,</if>
-            <if test="remarks != null">remarks,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="demandId != null">#{demandId},</if>
-            <if test="typeAndName != null">#{typeAndName},</if>
-            <if test="specification != null">#{specification},</if>
-            <if test="qualityTechnicalStandard != null">#{qualityTechnicalStandard},</if>
-            <if test="measurementUnit != null and measurementUnit != ''">#{measurementUnit},</if>
-            <if test="procurementQuantity != null">#{procurementQuantity},</if>
-            <if test="price != null">#{price},</if>
-            <if test="budgetAmount != null">#{budgetAmount},</if>
-            <if test="demandCommitTime != null">#{demandCommitTime},</if>
-            <if test="procurementMethodSuggest != null">#{procurementMethodSuggest},</if>
-            <if test="remarks != null">#{remarks},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePmDemandEquip" parameterType="com.ozs.pm.doman.PmDemandEquip">
-        update pm_demand_equip
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="demandId != null">demand_id = #{demandId},</if>
-            <if test="typeAndName != null">type_and_name = #{typeAndName},</if>
-            <if test="specification != null">specification = #{specification},</if>
-            <if test="qualityTechnicalStandard != null">quality_technical_standard = #{qualityTechnicalStandard},</if>
-            <if test="measurementUnit != null and measurementUnit != ''">measurement_unit = #{measurementUnit},</if>
-            <if test="procurementQuantity != null">procurement_quantity = #{procurementQuantity},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="budgetAmount != null">budget_amount = #{budgetAmount},</if>
-            <if test="demandCommitTime != null">demand_commit_time = #{demandCommitTime},</if>
-            <if test="procurementMethodSuggest != null">procurement_method_suggest = #{procurementMethodSuggest},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where demand_equip_id = #{demandEquipId}
-    </update>
 
 </mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandMaterialsMapper.xml

@@ -4,110 +4,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.pm.mapper.PmDemandMaterialsMapper">
     
-    <resultMap type="com.ozs.pm.doman.PmDemandMaterials" id="PmDemandMaterialsResult">
-        <result property="demandMaterialsId"    column="demand_materials_id"    />
-        <result property="demandId"    column="demand_id"    />
-        <result property="typeAndName"    column="type_and_name"    />
-        <result property="specification"    column="specification"    />
-        <result property="qualityTechnicalStandard"    column="quality_technical_standard"    />
-        <result property="measurementUnit"    column="measurement_unit"    />
-        <result property="procurementQuantity"    column="procurement_quantity"    />
-        <result property="price"    column="price"    />
-        <result property="budgetAmount"    column="budget_amount"    />
-        <result property="demandCommitTime"    column="demand_commit_time"    />
-        <result property="procurementMethodSuggest"    column="procurement_method_suggest"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectPmDemandMaterialsVo">
-        select demand_materials_id, demand_id, type_and_name, specification, quality_technical_standard, measurement_unit, procurement_quantity, price, budget_amount, demand_commit_time, procurement_method_suggest, remarks, create_by, create_time, update_by, update_time from pm_demand_materials
-    </sql>
-
-    <select id="selectPmDemandMaterialsList" parameterType="com.ozs.pm.doman.PmDemandMaterials" resultMap="PmDemandMaterialsResult">
-        <include refid="selectPmDemandMaterialsVo"/>
-        <where>  
-            <if test="demandId != null "> and demand_id = #{demandId}</if>
-            <if test="typeAndName != null  and typeAndName != ''"> and type_and_name like concat('%', #{typeAndName}, '%')</if>
-            <if test="specification != null  and specification != ''"> and specification = #{specification}</if>
-            <if test="qualityTechnicalStandard != null  and qualityTechnicalStandard != ''"> and quality_technical_standard = #{qualityTechnicalStandard}</if>
-            <if test="measurementUnit != null  and measurementUnit != ''"> and measurement_unit = #{measurementUnit}</if>
-            <if test="procurementQuantity != null "> and procurement_quantity = #{procurementQuantity}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="budgetAmount != null "> and budget_amount = #{budgetAmount}</if>
-            <if test="demandCommitTime != null "> and demand_commit_time = #{demandCommitTime}</if>
-            <if test="procurementMethodSuggest != null  and procurementMethodSuggest != ''"> and procurement_method_suggest = #{procurementMethodSuggest}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-
-        </where>
-    </select>
-    
-    <select id="selectPmDemandMaterialsByDemandMaterialsId" parameterType="Long" resultMap="PmDemandMaterialsResult">
-        <include refid="selectPmDemandMaterialsVo"/>
-        where demand_materials_id = #{demandMaterialsId}
-    </select>
-        
-    <insert id="insertPmDemandMaterials" parameterType="com.ozs.pm.doman.PmDemandMaterials" useGeneratedKeys="true" keyProperty="demandMaterialsId">
-        insert into pm_demand_materials
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="demandId != null">demand_id,</if>
-            <if test="typeAndName != null">type_and_name,</if>
-            <if test="specification != null">specification,</if>
-            <if test="qualityTechnicalStandard != null">quality_technical_standard,</if>
-            <if test="measurementUnit != null">measurement_unit,</if>
-            <if test="procurementQuantity != null">procurement_quantity,</if>
-            <if test="price != null">price,</if>
-            <if test="budgetAmount != null">budget_amount,</if>
-            <if test="demandCommitTime != null">demand_commit_time,</if>
-            <if test="procurementMethodSuggest != null">procurement_method_suggest,</if>
-            <if test="remarks != null">remarks,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="demandId != null">#{demandId},</if>
-            <if test="typeAndName != null">#{typeAndName},</if>
-            <if test="specification != null">#{specification},</if>
-            <if test="qualityTechnicalStandard != null">#{qualityTechnicalStandard},</if>
-            <if test="measurementUnit != null">#{measurementUnit},</if>
-            <if test="procurementQuantity != null">#{procurementQuantity},</if>
-            <if test="price != null">#{price},</if>
-            <if test="budgetAmount != null">#{budgetAmount},</if>
-            <if test="demandCommitTime != null">#{demandCommitTime},</if>
-            <if test="procurementMethodSuggest != null">#{procurementMethodSuggest},</if>
-            <if test="remarks != null">#{remarks},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePmDemandMaterials" parameterType="com.ozs.pm.doman.PmDemandMaterials">
-        update pm_demand_materials
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="demandId != null">demand_id = #{demandId},</if>
-            <if test="typeAndName != null">type_and_name = #{typeAndName},</if>
-            <if test="specification != null">specification = #{specification},</if>
-            <if test="qualityTechnicalStandard != null">quality_technical_standard = #{qualityTechnicalStandard},</if>
-            <if test="measurementUnit != null">measurement_unit = #{measurementUnit},</if>
-            <if test="procurementQuantity != null">procurement_quantity = #{procurementQuantity},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="budgetAmount != null">budget_amount = #{budgetAmount},</if>
-            <if test="demandCommitTime != null">demand_commit_time = #{demandCommitTime},</if>
-            <if test="procurementMethodSuggest != null">procurement_method_suggest = #{procurementMethodSuggest},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where demand_materials_id = #{demandMaterialsId}
-    </update>
 
 </mapper>

purchase-system/src/main/resources/mapper/pm/PmDemandServeMapper.xml

@@ -3,110 +3,6 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.pm.mapper.PmDemandServeMapper">
-    
-    <resultMap type="com.ozs.pm.doman.PmDemandServe" id="PmDemandServeResult">
-        <result property="demandServeId"    column="demand_serve_id"    />
-        <result property="demandId"    column="demand_id"    />
-        <result property="serviceName"    column="service_name"    />
-        <result property="technicalServiceRequirement"    column="technical_service_requirement"    />
-        <result property="measurementUnit"    column="measurement_unit"    />
-        <result property="procurementQuantity"    column="procurement_quantity"    />
-        <result property="price"    column="price"    />
-        <result property="budgetAmount"    column="budget_amount"    />
-        <result property="deliveryTimeLimit"    column="delivery_time_limit"    />
-        <result property="procurementMethodSuggest"    column="procurement_method_suggest"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
 
-    <sql id="selectPmDemandServeVo">
-        select demand_serve_id, demand_id, service_name, technical_service_requirement, measurement_unit, procurement_quantity, price, budget_amount, delivery_time_limit, procurement_method_suggest, supplier_id, remarks, create_by, create_time, update_by, update_time from pm_demand_serve
-    </sql>
-
-    <select id="selectPmDemandServeList" parameterType="com.ozs.pm.doman.PmDemandServe" resultMap="PmDemandServeResult">
-        <include refid="selectPmDemandServeVo"/>
-        <where>  
-            <if test="demandId != null "> and demand_id = #{demandId}</if>
-            <if test="serviceName != null  and serviceName != ''"> and service_name like concat('%', #{serviceName}, '%')</if>
-            <if test="technicalServiceRequirement != null  and technicalServiceRequirement != ''"> and technical_service_requirement = #{technicalServiceRequirement}</if>
-            <if test="measurementUnit != null  and measurementUnit != ''"> and measurement_unit = #{measurementUnit}</if>
-            <if test="procurementQuantity != null "> and procurement_quantity = #{procurementQuantity}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="budgetAmount != null "> and budget_amount = #{budgetAmount}</if>
-            <if test="deliveryTimeLimit != null  and deliveryTimeLimit != ''"> and delivery_time_limit = #{deliveryTimeLimit}</if>
-            <if test="procurementMethodSuggest != null  and procurementMethodSuggest != ''"> and procurement_method_suggest = #{procurementMethodSuggest}</if>
-            <if test="supplierId != null "> and supplier_id = #{supplierId}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-        </where>
-    </select>
-    
-    <select id="selectPmDemandServeByDemandServeId" parameterType="Long" resultMap="PmDemandServeResult">
-        <include refid="selectPmDemandServeVo"/>
-        where demand_serve_id = #{demandServeId}
-    </select>
-        
-    <insert id="insertPmDemandServe" parameterType="com.ozs.pm.doman.PmDemandServe" useGeneratedKeys="true" keyProperty="demandServeId">
-        insert into pm_demand_serve
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="demandId != null">demand_id,</if>
-            <if test="serviceName != null">service_name,</if>
-            <if test="technicalServiceRequirement != null">technical_service_requirement,</if>
-            <if test="measurementUnit != null">measurement_unit,</if>
-            <if test="procurementQuantity != null">procurement_quantity,</if>
-            <if test="price != null">price,</if>
-            <if test="budgetAmount != null">budget_amount,</if>
-            <if test="deliveryTimeLimit != null">delivery_time_limit,</if>
-            <if test="procurementMethodSuggest != null">procurement_method_suggest,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="remarks != null">remarks,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="demandId != null">#{demandId},</if>
-            <if test="serviceName != null">#{serviceName},</if>
-            <if test="technicalServiceRequirement != null">#{technicalServiceRequirement},</if>
-            <if test="measurementUnit != null">#{measurementUnit},</if>
-            <if test="procurementQuantity != null">#{procurementQuantity},</if>
-            <if test="price != null">#{price},</if>
-            <if test="budgetAmount != null">#{budgetAmount},</if>
-            <if test="deliveryTimeLimit != null">#{deliveryTimeLimit},</if>
-            <if test="procurementMethodSuggest != null">#{procurementMethodSuggest},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="remarks != null">#{remarks},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePmDemandServe" parameterType="com.ozs.pm.doman.PmDemandServe">
-        update pm_demand_serve
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="demandId != null">demand_id = #{demandId},</if>
-            <if test="serviceName != null">service_name = #{serviceName},</if>
-            <if test="technicalServiceRequirement != null">technical_service_requirement = #{technicalServiceRequirement},</if>
-            <if test="measurementUnit != null">measurement_unit = #{measurementUnit},</if>
-            <if test="procurementQuantity != null">procurement_quantity = #{procurementQuantity},</if>
-            <if test="price != null">price = #{price},</if>
-            <if test="budgetAmount != null">budget_amount = #{budgetAmount},</if>
-            <if test="deliveryTimeLimit != null">delivery_time_limit = #{deliveryTimeLimit},</if>
-            <if test="procurementMethodSuggest != null">procurement_method_suggest = #{procurementMethodSuggest},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where demand_serve_id = #{demandServeId}
-    </update>
 
 </mapper>

purchase-system/src/main/resources/mapper/pm/PmFlowChartMapper.xml

@@ -3,80 +3,5 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.pm.mapper.PmFlowChartMapper">
-    
-    <resultMap type="com.ozs.pm.doman.PmFlowChart" id="PmFlowChartResult">
-        <result property="flowChartId"    column="flow_chart_id"    />
-        <result property="moduleName"    column="module_name"    />
-        <result property="deptRole"    column="dept_role"    />
-        <result property="promptWords"    column="prompt_words"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
 
-    <sql id="selectPmFlowChartVo">
-        select flow_chart_id, module_name, dept_role, prompt_words, create_by, create_time, update_by, update_time from pm_flow_chart
-    </sql>
-
-    <select id="selectPmFlowChartList" parameterType="com.ozs.pm.doman.PmFlowChart" resultMap="PmFlowChartResult">
-        <include refid="selectPmFlowChartVo"/>
-        <where>  
-            <if test="moduleName != null  and moduleName != ''"> and module_name like concat('%', #{moduleName}, '%')</if>
-            <if test="deptRole != null  and deptRole != ''"> and dept_role = #{deptRole}</if>
-            <if test="promptWords != null  and promptWords != ''"> and prompt_words = #{promptWords}</if>
-        </where>
-    </select>
-    
-    <select id="selectPmFlowChartByFlowChartId" parameterType="Long" resultMap="PmFlowChartResult">
-        <include refid="selectPmFlowChartVo"/>
-        where flow_chart_id = #{flowChartId}
-    </select>
-        
-    <insert id="insertPmFlowChart" parameterType="com.ozs.pm.doman.PmFlowChart" useGeneratedKeys="true" keyProperty="flowChartId">
-        insert into pm_flow_chart
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="moduleName != null and moduleName != ''">module_name,</if>
-            <if test="deptRole != null">dept_role,</if>
-            <if test="promptWords != null">prompt_words,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
-            <if test="deptRole != null">#{deptRole},</if>
-            <if test="promptWords != null">#{promptWords},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePmFlowChart" parameterType="com.ozs.pm.doman.PmFlowChart">
-        update pm_flow_chart
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
-            <if test="deptRole != null">dept_role = #{deptRole},</if>
-            <if test="promptWords != null">prompt_words = #{promptWords},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where flow_chart_id = #{flowChartId}
-    </update>
-
-    <delete id="deletePmFlowChartByFlowChartId" parameterType="Long">
-        delete from pm_flow_chart where flow_chart_id = #{flowChartId}
-    </delete>
-
-    <delete id="deletePmFlowChartByFlowChartIds" parameterType="String">
-        delete from pm_flow_chart where flow_chart_id in 
-        <foreach item="flowChartId" collection="array" open="(" separator="," close=")">
-            #{flowChartId}
-        </foreach>
-    </delete>
 </mapper>