Merge remote-tracking branch 'origin/master'

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

@@ -66,6 +66,14 @@ public class PmDemandController extends BaseController {
         return toAjax(pmDemandService.bookBuilding(pmBookBuildingReqVo));
     }
 
+    @ApiOperation(value = "提交采购需求", notes = "必传demandId,其他字段不传")
+    @PostMapping("/commit")
+    public AjaxResult commit(@RequestBody PmDemandReqVo pmDemandReqVo, HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        pmDemandReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
+        return toAjax(pmDemandService.commit(pmDemandReqVo));
+    }
+
     /**
      * 查看流程图，获取当前阶段名字
      */
@@ -84,13 +92,6 @@ public class PmDemandController extends BaseController {
         return success(pmDemandService.getModuleInfo(pmRequestVo.getDemandId(),pmRequestVo.getModuleName()));
     }
 
-    @ApiOperation(value = "提交采购需求", notes = "必传demandId,其他字段不传")
-    @PostMapping("/commit")
-    public AjaxResult commit(@RequestBody PmDemandReqVo pmDemandReqVo, HttpServletRequest request) {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        pmDemandReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
-        return toAjax(pmDemandService.commit(pmDemandReqVo));
-    }
 
     /**
      * 审核单位查询采购需求列表

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

@@ -44,4 +44,21 @@ public class PmTaskReleaseController extends BaseController {
         IPage<PmDemandResVo> page  = pmDemandService.selectPmDemandList(pmDemandReqVo,2);
         return success(page);
     }
+
+    @ApiOperation(value = "下达任务", notes = "必传demandId和上传附件，其他字段不传")
+    @PostMapping("/releaseTask")
+    public AjaxResult releaseTask(@RequestBody PmDemandReqVo pmDemandReqVo, HttpServletRequest request) {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        pmDemandReqVo.setUpdateBy(String.valueOf(loginUser.getUserId()));
+        return toAjax(pmDemandService.releaseTask(pmDemandReqVo));
+    }
+
+    /**
+     * 获取采购需求详细信息
+     */
+    @ApiOperation(value = "获取采购需求详细信息", notes = "必传demandId,其他字段不传")
+    @PostMapping("/view")
+    public AjaxResult view(@RequestBody PmDemandReqVo pmDemandReqVo) {
+        return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId()));
+    }
 }

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

@@ -17,7 +17,8 @@ public enum SysFileRefEnum {
     PM_DEMAND_MATERIALS(6, "采购需求物资类附件"),
     PM_DEMAND_SERVE(7, "采购需求服务类附件"),
     PM_DEMAND_ENGINEERING(8, "采购需求工程类附件"),
-    PM_DEMAND_EXAMINE(9, "采购需求审核文件")
+    PM_DEMAND_EXAMINE(9, "采购需求审核文件"),
+    PM_TAST_RELEASE(10, "任务下达文件")
     ;
 
     private Integer type;

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

@@ -227,4 +227,10 @@ public class PmDemandResVo extends BaseEntity
      */
     @ApiModelProperty("采购需求审核文件")
     HashMap<String, String> auditFileMap;
+
+    /**
+     * 任务下达文件
+     */
+    @ApiModelProperty("任务下达文件")
+    HashMap<String, String> taskReleaseFileMap;
 }

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

@@ -98,4 +98,12 @@ public interface IPmDemandService extends IService<PmDemand>
      * @return 结果
      */
     public int reviewReturn(PmDemandReqVo pmDemandReqVo);
+
+    /**
+     * 下达任务
+     *
+     * @param pmDemandReqVo
+     * @return 结果
+     */
+    public int releaseTask(PmDemandReqVo pmDemandReqVo);
 }

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

@@ -82,16 +82,24 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 vo.setPurchaseServicesName(purchaseServicesName);
             }
 
+            //采购需求附件
             HashMap<String, String> demandFileMap = getFileMap(vo.getDemandId(),SysFileRefEnum.PM_DEMAND.getType());
             if(demandFileMap != null){
                 vo.setDemandFileMap(demandFileMap);
             }
 
+            //采购需求审核文件
             HashMap<String, String> auditFileMap = getFileMap(vo.getDemandId(),SysFileRefEnum.PM_DEMAND_EXAMINE.getType());
             if(auditFileMap != null){
                 vo.setAuditFileMap(auditFileMap);
             }
 
+            //任务下达文件
+            HashMap<String, String> taskReleaseFileMap = getFileMap(vo.getDemandId(),SysFileRefEnum.PM_TAST_RELEASE.getType());
+            if(taskReleaseFileMap != null){
+                vo.setTaskReleaseFileMap(taskReleaseFileMap);
+            }
+
             //项目类型
             for (ProjectTypes value : ProjectTypes.values()) {
                 if (vo.getProjectType() != null && vo.getProjectType().equals(value.getCode())) {
@@ -701,4 +709,34 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         pmDemand.setAuditTime(DateUtils.getNowDate());
         return pmDemandMapper.updatePmDemand(pmDemand);
     }
+
+    /**
+     * 下达任务
+     *
+     * @param pmDemandReqVo
+     * @return 结果
+     */
+    @Override
+    public int releaseTask(PmDemandReqVo pmDemandReqVo) {
+        PmDemand pmDemand = new PmDemand();
+        pmDemand.setDemandId(pmDemandReqVo.getDemandId());
+        pmDemand.setProjectStatus(Long.parseLong(PmProjectStatus.BID_INFO_WAIT_FILL.getCode()));
+        List<SysFileRef> sysFileRefs = pmDemandReqVo.getSysFileRefs();
+        if (!ObjectUtils.isEmpty(sysFileRefs)) {
+            for (SysFileRef ref : sysFileRefs) {
+                ref.setRedId(pmDemandReqVo.getDemandId());
+                ref.setType(SysFileRefEnum.PM_TAST_RELEASE.getType());
+                ref.setCreated(pmDemandReqVo.getUpdateBy());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(pmDemandReqVo.getUpdateBy());
+                ref.setUpdateTime(new Date());
+                sysFileRefService.save(ref);
+            }
+        }
+        pmDemand.setUpdateBy(pmDemandReqVo.getUpdateBy());
+        pmDemand.setUpdateTime(DateUtils.getNowDate());
+        pmDemand.setAuditTime(DateUtils.getNowDate());
+        return pmDemandMapper.updatePmDemand(pmDemand);
+    }
+
 }