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

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

@@ -101,6 +101,7 @@ public class BaseExpertController extends BaseController {
         if (!ObjectUtils.isEmpty(baseExpertVo.getMajorGrade())) {
             lw.eq(BaseExpert::getMajorGrade, baseExpertVo.getMajorGrade());
         }
+        lw.orderBy(true, false, BaseExpert::getCreateTime);
         List<BaseExpert> list = baseExpertService.list(lw);
         // IPage<BaseExpert> page = baseExpertService.page(new Page<BaseExpert>(baseExpertVo.getPageNum(), baseExpertVo.getPageSize()), lw);
         // List<BaseExpert> records = page.getRecords();

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.BaseProfessional;
 import com.ozs.base.domain.vo.BaseExpertVo;
+import com.ozs.base.domain.vo.BaseProfessionalVo;
 import com.ozs.base.service.BaseAgencyService;
 import com.ozs.base.service.BaseExpertService;
+import com.ozs.base.service.BaseProfessionalService;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.controller.BaseController;
@@ -58,6 +61,10 @@ public class PmPurchaseExecutionController extends BaseController {
     private PmDemandExpertRefService pmDemandExpertRefService;
     @Autowired
     private PmBidOpeningService pmBidOpeningService;
+    @Autowired
+    private BaseProfessionalService baseProfessionalService;
+
+
     /**
      * 采购执行查询列表
      */
@@ -258,6 +265,15 @@ public class PmPurchaseExecutionController extends BaseController {
         return success(baseExpert);
     }
 
+    @ApiOperation(value = "查询专业库树结构", notes = "非必传 查询条件：品目名称")
+    @PostMapping("/selectBaseProfessional")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:selectBaseProfessional')")
+    @Log(title = ModularConstans.professional, businessType = BusinessType.QUERY)
+    public AjaxResult selectBaseProfessional(@RequestBody BaseProfessionalVo baseProfessionalVo) {
+        List<BaseProfessionalVo> baseSupplierList = baseProfessionalService.selectBaseProfessionalVo(baseProfessionalVo);
+        return success(baseSupplierList);
+    }
+
 
     @ApiOperation(value = "填写专家信息批量提交", notes = "必传 采购需求ID和专家信息列表,注意：若该专家已经在库里存在，需要传专家对象BaseExpert的ID")
     @PostMapping("/insertExpertBatch")
@@ -516,7 +532,7 @@ public class PmPurchaseExecutionController extends BaseController {
                 if(baseExpert != null){
                     BaseExpertVo baseExpertVo = new BaseExpertVo();
                     BeanUtils.copyProperties(baseExpert,baseExpertVo);
-                    baseExpertVo.setMajorTypeName(MajorType.getCodeToInfo(baseExpertVo.getMajorType()));
+                    baseExpertVo.setMajorTypeName(getMajorTypeName(baseExpertVo.getMajorType()));
                     baseExpertVo.setExpertTypeName(ExpertType.getCodeToInfo(baseExpertVo.getExpertType()));
                     baseExpertVo.setVarietyPurchaseName(PurchaseType.getCodeToInfo(baseExpertVo.getVarietyPurchase()));
                     baseExpertVoList.add(baseExpertVo);
@@ -527,6 +543,27 @@ public class PmPurchaseExecutionController extends BaseController {
         return success(baseExpertVoList);
     }
 
+    private String getMajorTypeName(String majorType){
+        if(ObjectUtils.isEmpty(majorType)) {
+            return null;
+        }
+        LambdaQueryWrapper<BaseProfessional> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(BaseProfessional::getProfessionalCode,majorType.split(","));
+        List<BaseProfessional> list = this.baseProfessionalService.list(lambdaQueryWrapper);
+        if(ObjectUtils.isEmpty(list)){
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for(BaseProfessional baseProfessional : list){
+            sb.append(baseProfessional.getProfessionalName()).append(",");
+        }
+        String majorTypeName = sb.toString();
+        if(majorTypeName.endsWith(",")){
+            majorTypeName = majorTypeName.substring(0, majorTypeName.length() - 1);
+        }
+        return majorTypeName;
+    }
+
   /**
      * 开标信息查看详情列表
      */

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

@@ -1,59 +0,0 @@
-package com.ozs.common.enums;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * 专家类型
- *
- * @author buzhanyi
- */
-public enum MajorType {
-    TECHNICAL_EXPERT("1", "机电设备安装工程"),
-    ECONOMIC_EXPERT("2", "城市供热工程"),
-    LEGALAFFAIRS_EXPERT("3", "电子通信"),
-    SPARE_EXPERT("4", "房主建筑");
-
-    private final String code;
-    private final String info;
-
-    MajorType(String code, String info) {
-        this.code = code;
-        this.info = info;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getInfo() {
-        return info;
-    }
-
-    public static String getCodeToInfo(String code){
-        if (ObjectUtils.isEmpty(code)){
-            return null;
-        }
-
-        StringBuilder infos = new StringBuilder();
-        String[] codes = code.split(",");
-        if (codes.length > 0){
-            for(String item : codes){
-                if (TECHNICAL_EXPERT.getCode().equals(item)){
-                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
-                } else if (ECONOMIC_EXPERT.getCode().equals(item)){
-                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
-                } else if (LEGALAFFAIRS_EXPERT.getCode().equals(item)){
-                    infos.append(LEGALAFFAIRS_EXPERT.getInfo()).append(",");
-                } else if (SPARE_EXPERT.getCode().equals(item)){
-                    infos.append(SPARE_EXPERT.getInfo()).append(",");
-                }
-            }
-        }
-        String infoStr = infos.toString();
-        if(infoStr.endsWith(",")) {
-            infoStr = infoStr.substring(0,infos.length() - 1);
-        }
-        return infoStr;
-
-    }
-}

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

@@ -39,7 +39,7 @@ public enum PurchaseType {
         if (codes.length > 0){
             for(String item : codes){
                 if (TECHNICAL_EXPERT.getCode().equals(item)){
-                    infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
+                    infos.append(TECHNICAL_EXPERT.getInfo()).append(",");
                 } else if (ECONOMIC_EXPERT.getCode().equals(item)){
                     infos.append(ECONOMIC_EXPERT.getInfo()).append(",");
                 } else if (LEGALAFFAIRS_EXPERT.getCode().equals(item)){

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

@@ -1082,6 +1082,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
             } else if ("4".equals(detailType)) { //中标信息
                 PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
+                List<SysFileInfo> fileInfosAll =  new ArrayList<>();
                 //代理商信息
                 BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
                 pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
@@ -1096,7 +1097,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         BeanUtils.copyProperties(pmReleaseAnnouncement, pmReleaseAnnouncementResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncement.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmReleaseAnnouncementResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmReleaseAnnouncementResVoList.add(pmReleaseAnnouncementResVo);
                     }
@@ -1119,7 +1120,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         BeanUtils.copyProperties(pmBidWinning, pmBidWinningResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmBidWinningResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmBidWinningResVoList.add(pmBidWinningResVo);
                     }
@@ -1141,7 +1142,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmPurchaseExecutionResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmBidFailureResVoList.add(pmBidFailureResVo);
                     }
@@ -1150,8 +1151,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 //中标通知书
                 List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType());
                 if (!ObjectUtils.isEmpty(pmBidWinningNotificationFileInfos)) {
-                    pmPurchaseExecutionResVo.setPmBidWinningNotificationFileInfos(pmBidWinningNotificationFileInfos);
+                    fileInfosAll.addAll(pmBidWinningNotificationFileInfos);
                 }
+                pmPurchaseExecutionResVo.setFileInfos(fileInfosAll);
                 vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
             } else if ("5".equals(detailType)) { //合同信息
                 LambdaQueryWrapper<PmContractInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();

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

@@ -448,7 +448,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         }
         PmDemand demand = new PmDemand();
         BeanUtils.copyProperties(byId, demand);
-        demand.setPlanId(byId.getPlanPracticalId());
+        demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
         demand.setEvaluation(byId.getEvaluation().doubleValue());
         demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         //同步到项目管理状态为需求待填制

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

@@ -62,12 +62,6 @@ public class PmPurchaseExecutionResVo {
     @ApiModelProperty("流标信息列表")
     private List<PmBidFailureResVo> pmBidFailureResVoList;
 
-    /**
-     * 中标通知书
-     */
-    @ApiModelProperty("中标通知书")
-    private List<SysFileInfo> pmBidWinningNotificationFileInfos;
-
     /**
      * 已上传的关联附件信息
      */

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

@@ -231,8 +231,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 }
             } else if ("4".equals(detailType)) { //中标信息
                 PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
-
-                //代理商信息
+                List<SysFileInfo> fileInfosAll =  new ArrayList<>();
+                        //代理商信息
                 BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
                 pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
 
@@ -248,7 +248,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncement.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmReleaseAnnouncementResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmReleaseAnnouncementResVoList.add(pmReleaseAnnouncementResVo);
                     }
@@ -284,7 +284,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                                 List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
                                 if (!ObjectUtils.isEmpty(fileInfos)) {
-                                    pmBidWinningResVo.setFileInfos(fileInfos);
+                                    fileInfosAll.addAll(fileInfos);
                                 }
                                 pmBidWinningResVoList.add(pmBidWinningResVo);
                             }
@@ -313,7 +313,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                         BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmPurchaseExecutionResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmBidFailureResVoList.add(pmBidFailureResVo);
                     }
@@ -323,9 +323,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 //中标通知书
                 List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType());
                 if (!ObjectUtils.isEmpty(pmBidWinningNotificationFileInfos)) {
-                    pmPurchaseExecutionResVo.setPmBidWinningNotificationFileInfos(pmBidWinningNotificationFileInfos);
+                    fileInfosAll.addAll(pmBidWinningNotificationFileInfos);
                 }
 
+                pmPurchaseExecutionResVo.setFileInfos(fileInfosAll);
                 vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
 
             } else if ("5".equals(detailType)) { //合同信息
@@ -850,6 +851,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 baseNotice.setIsExcess(pmDemand.getIsExcess());
                 baseNotice.setType(baseNoticeType.getId());
                 baseNotice.setReleaseTime(pmReleaseAnnouncement.getReleaseTime());
+                baseNotice.setCreated(pmReleaseAnnouncementReqVo.getCreateBy());
+                baseNotice.setCreateTime(pmReleaseAnnouncementReqVo.getCreateTime());
+                baseNotice.setUpdated(pmReleaseAnnouncementReqVo.getUpdateBy());
+                baseNotice.setUpdateTime(pmReleaseAnnouncementReqVo.getUpdateTime());
                 return this.baseNoticeService.saveOrUpdate(baseNotice);
             } else {
                 return false;
@@ -1209,6 +1214,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 baseNotice.setIsExcess(pmDemand.getIsExcess());
                 baseNotice.setType(baseNoticeType.getId());
                 baseNotice.setReleaseTime(pmBidWinningReqVo.getBidAnnouncementTime());
+                baseNotice.setCreated(pmBidWinningReqVo.getCreateBy());
+                baseNotice.setCreateTime(pmBidWinningReqVo.getCreateTime());
+                baseNotice.setUpdated(pmBidWinningReqVo.getUpdateBy());
+                baseNotice.setUpdateTime(pmBidWinningReqVo.getUpdateTime());
                 this.baseNoticeService.saveOrUpdate(baseNotice);
 
                 PmDemand pmDemandUpdate = new PmDemand();
@@ -1216,6 +1225,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 pmDemandUpdate.setProjectStatus(PmProjectStatus.BIDDING_PUBLICITY.getCode());
                 pmDemandUpdate.setUpdateTime(pmBidWinningReqVo.getUpdateTime());
                 pmDemandUpdate.setUpdateBy(pmBidWinningReqVo.getUpdateBy());
+
                 return this.updateById(pmDemandUpdate);
 
             } else {
@@ -1345,6 +1355,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             baseNotice.setIsExcess(pmDemand.getIsExcess());
             baseNotice.setType(baseNoticeType.getId());
             baseNotice.setReleaseTime(pmBidFailureReqVo.getBidFailureTime());
+            baseNotice.setCreated(pmBidFailureReqVo.getCreateBy());
+            baseNotice.setCreateTime(pmBidFailureReqVo.getCreateTime());
+            baseNotice.setUpdated(pmBidFailureReqVo.getUpdateBy());
+            baseNotice.setUpdateTime(pmBidFailureReqVo.getUpdateTime());
             this.baseNoticeService.saveOrUpdate(baseNotice);
 
             PmDemand pmDemandUpdate = new PmDemand();

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

@@ -17,6 +17,10 @@
         <result property="status" column="status"/>
         <result property="localArea" column="local_area"/>
         <result property="idNumber" column="id_number"/>
+        <result property="created" column="created"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updated" column="updated"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <insert id="insertExpert" parameterType="com.ozs.base.domain.vo.BaseExpertVo">
@@ -25,6 +29,9 @@
             <if test="expertName != null and expertName != '' ">
                 expert_name,
             </if>
+            <if test="expertType != null and expertType != ''">
+                expert_type,
+            </if>
             <if test="expertGender != null and expertGender != '' ">
                 expert_gender,
             </if>
@@ -58,11 +65,20 @@
             <if test="idNumber != null and idNumber != ''">
                 id_number,
             </if>
+            <if test="created != null and created != ''">
+                created,
+            </if>
+            <if test="createTime != null and createTime != ''">
+                create_time,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="expertName != null and expertName != ''">
                 #{expertName},
             </if>
+            <if test="expertType != null and expertType != ''">
+                #{expertType},
+            </if>
             <if test="expertGender != null and expertGender != ''">
                 #{expertGender},
             </if>
@@ -96,7 +112,14 @@
             <if test="idNumber != null and idNumber != ''">
                 #{idNumber},
             </if>
+            <if test="created != null and created != ''">
+                #{created},
+            </if>
+            <if test="createTime != null and createTime != ''">
+                #{createTime},
+            </if>
         </trim>
+
     </insert>
 
     <select id="selectByUnitInformation" parameterType="java.lang.String"
@@ -134,4 +157,4 @@
             </if>
         </trim>
     </insert>
-</mapper>
+</mapper>