Merge remote-tracking branch 'origin/master'

src/main/java/com/migao/controller/DemandLibraryController.java

@@ -0,0 +1,82 @@
+package com.migao.controller;
+
+import com.migao.config.response.BasePageRequest;
+import com.migao.config.response.PageBeanOne;
+import com.migao.config.response.ResponseBean;
+import com.migao.entity.vo.req.DemandLibraryInsertReq;
+import com.migao.entity.vo.req.DemandLibraryQueryReq;
+import com.migao.entity.vo.req.DemandLibraryUpdateReq;
+import com.migao.entity.vo.req.DemandSubProjectReq;
+import com.migao.entity.vo.res.DemandLibraryPageQueryRes;
+import com.migao.entity.vo.res.DemandLibraryQueryRes;
+import com.migao.service.DemandLibraryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dingsong
+ */
+@Api(tags = "007.需求库模快")
+@RestController
+@RequestMapping("/demandLibrary")
+public class DemandLibraryController {
+    @Resource
+    DemandLibraryService demandLibraryService;
+
+    @ApiOperation("导入主需求")
+    @PostMapping(value = "/insert")
+    public ResponseBean<?> insert(@RequestBody DemandLibraryInsertReq demandLibrary){
+       return demandLibraryService.insert(demandLibrary);
+    }
+
+    @ApiOperation("导入子需求")
+    @PostMapping(value = "/insertSubProject")
+    public ResponseBean<?> insertSubProject(@RequestBody DemandSubProjectReq demandSubProjectReq) {
+        return demandLibraryService.insertSubProject(demandSubProjectReq);
+    }
+
+    @ApiOperation("删")
+    @PostMapping(value = "/deleteById")
+    public ResponseBean<?> deleteById(@RequestParam String id) {
+        return demandLibraryService.deleteById(id);
+    }
+
+    @ApiOperation("更新需求")
+    @PostMapping(value = "/update")
+    public ResponseBean<?> update(@RequestBody DemandLibraryUpdateReq libraryUpdateReq) {
+        return demandLibraryService.update(libraryUpdateReq);
+    }
+
+    @ApiOperation("分页查询所有需求数据")
+    @PostMapping(value = "/pageQuery")
+    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQuery(@RequestBody BasePageRequest basePageRequest) {
+        return demandLibraryService.pageQuery(basePageRequest);
+    }
+
+    @ApiOperation("分页查询当前用户需求数据")
+    @PostMapping(value = "/pageQueryById")
+    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryById(@RequestBody BasePageRequest basePageRequest) {
+        return demandLibraryService.pageQueryById(basePageRequest);
+    }
+
+    @ApiOperation("分页模糊查询所有需求数据")
+    @PostMapping(value = "/pageQueryOne")
+    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryOne(@RequestBody DemandLibraryQueryReq demandLibraryQuery) {
+        return demandLibraryService.pageQueryOne(demandLibraryQuery);
+    }
+
+    @ApiOperation("分页模糊查询当前用户需求数据")
+    @PostMapping(value = "/pageQueryOneById")
+    public ResponseBean<PageBeanOne<DemandLibraryPageQueryRes>> pageQueryOneById(@RequestBody DemandLibraryQueryReq demandLibraryQuery) {
+        return demandLibraryService.pageQueryOneById(demandLibraryQuery);
+    }
+
+    @ApiOperation("查询单条需求数据")
+    @PostMapping(value = "/findById")
+    public ResponseBean<DemandLibraryQueryRes> findById(@RequestParam String id) {
+        return demandLibraryService.findById(id);
+    }
+}

src/main/java/com/migao/entity/vo/req/DemandLibraryInsertReq.java

@@ -26,9 +26,9 @@ public class DemandLibraryInsertReq {
 //    @NotNull(message = "主键不能为空")
 //    private Integer id;
 
-    @ApiModelProperty(value = "需求编号")
-    @NotNull(message = "需求编号不能为空")
-    private String demandNumber;
+//    @ApiModelProperty(value = "需求编号")
+//    @NotNull(message = "需求编号不能为空")
+//    private String demandNumber;
 
     @ApiModelProperty(value = "需求名称")
     @NotEmpty(message = "需求名称不能为空")

src/main/java/com/migao/entity/vo/req/DemandLibraryUpdateReq.java

@@ -65,4 +65,9 @@ public class DemandLibraryUpdateReq {
      * 附件
      */
     private List<Integer> fileId = new ArrayList<>();
+
+    /**
+     * 子项目
+     */
+    private List<Integer> subProjectId = new ArrayList<>();
 }

src/main/java/com/migao/entity/vo/req/DemandSubProjectReq.java

@@ -0,0 +1,23 @@
+package com.migao.entity.vo.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Data
+public class DemandSubProjectReq {
+    @ApiModelProperty(value = "需求名称")
+    @NotEmpty(message = "需求名称不能为空")
+    private String demandName;
+
+    @ApiModelProperty(value = "需求内容")
+    @NotEmpty(message = "需求内容不能为空")
+    private String demandContent;
+}

src/main/java/com/migao/service/DemandLibraryService.java

@@ -8,6 +8,7 @@ import com.migao.entity.po.DemandLibrary;
 import com.migao.entity.vo.req.DemandLibraryInsertReq;
 import com.migao.entity.vo.req.DemandLibraryQueryReq;
 import com.migao.entity.vo.req.DemandLibraryUpdateReq;
+import com.migao.entity.vo.req.DemandSubProjectReq;
 import com.migao.entity.vo.res.DemandLibraryPageQueryRes;
 import com.migao.entity.vo.res.DemandLibraryQueryRes;
 
@@ -16,12 +17,19 @@ import com.migao.entity.vo.res.DemandLibraryQueryRes;
  */
 public interface DemandLibraryService extends IService<DemandLibrary> {
     /**
-     * 增
+     * 新增主需求
      * @param demandLibrary
      * @return
      */
     ResponseBean<?> insert(DemandLibraryInsertReq demandLibrary);
 
+    /**
+     * 新增子需求
+     * @param demandSubProjectReq
+     * @return
+     */
+    ResponseBean<?> insertSubProject(DemandSubProjectReq demandSubProjectReq);
+
     /**
      * 删
      * @param id

src/main/java/com/migao/service/impl/DemandLibraryServiceImpl.java

@@ -12,6 +12,7 @@ import com.migao.entity.po.User;
 import com.migao.entity.vo.req.DemandLibraryInsertReq;
 import com.migao.entity.vo.req.DemandLibraryQueryReq;
 import com.migao.entity.vo.req.DemandLibraryUpdateReq;
+import com.migao.entity.vo.req.DemandSubProjectReq;
 import com.migao.entity.vo.res.DemandAttachmentRes;
 import com.migao.entity.vo.res.DemandLibraryPageQueryRes;
 import com.migao.entity.vo.res.DemandLibraryQueryRes;
@@ -46,13 +47,15 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
     ProjectMapper projectMapper;
     @Resource
     FileInfoMapper fileInfoMapper;
+    @Resource
+    UserMapper userMapper;
 
     @Override
     public ResponseBean<?> insert(DemandLibraryInsertReq demandLibrary) {
         //获取当前登录用户的信息
         User user = LoginUtils.getUser();
 
-        //提交主项目
+        //提交主需求
         DemandLibrary dic = EntityUtils.copyProperties(demandLibrary,DemandLibrary.class);
         dic.setSubmitTime(LocalDateTime.now());
         dic.setDeleted(0);
@@ -60,6 +63,14 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         dic.setDemandNumber(ProjectNoUtil.getCode());
         demandLibraryMap.insert(dic);
 
+        //更新子需求父id
+        for(Integer i : demandLibrary.getSubProjectId()){
+            DemandLibrary dicn = demandLibraryMap.selectById(i);
+            dicn.setSubProjectId(dic.getId());
+            demandLibraryMap.updateById(dicn);
+        }
+
+        //提交附件
         for(Integer i : demandLibrary.getFileId()){
             DemandAttachment demandAttachment = DemandAttachment
                     .builder()
@@ -75,6 +86,20 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         return ResponseBuilder.ok();
     }
 
+    @Override
+    public ResponseBean<?> insertSubProject(DemandSubProjectReq demandSubProjectReq) {
+        //获取当前登录用户的信息
+        User user = LoginUtils.getUser();
+        //提交子需求
+        DemandLibrary dic = EntityUtils.copyProperties(demandSubProjectReq,DemandLibrary.class);
+        dic.setSubmitTime(LocalDateTime.now());
+        dic.setDeleted(0);
+        dic.setCreateUserId(user.getId());
+        dic.setDemandNumber(ProjectNoUtil.getCode());
+        demandLibraryMap.insert(dic);
+        return ResponseBuilder.ok(dic.getId());
+    }
+
     @Override
     public ResponseBean<?> deleteById(String id) {
         Integer idInt = Integer.parseInt(id);
@@ -89,10 +114,19 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         //获取当前登录用户的信息
         User user = LoginUtils.getUser();
 
+        //更新主需求
         DemandLibrary dic = EntityUtils.copyProperties(libraryUpdateReq,DemandLibrary.class);
         dic.setSubmitTime(LocalDateTime.now());
         demandLibraryMap.updateById(dic);
 
+        //更新子需求
+        for(Integer i : libraryUpdateReq.getSubProjectId()){
+            DemandLibrary dicn = demandLibraryMap.selectById(i);
+            dicn.setSubProjectId(dic.getId());
+            demandLibraryMap.updateById(dicn);
+        }
+
+        //更新附件
         for(Integer i : libraryUpdateReq.getFileId()){
             DemandAttachment demandAttachment = DemandAttachment
                     .builder()
@@ -116,6 +150,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
         dynamicQuery.isNull(DemandLibrary::getSubProjectId);
+        dynamicQuery.eq(DemandLibrary::getDeleted,0);
         dynamicQuery.orderByDesc(DemandLibrary::getSubmitTime);
 
         Page<DemandLibrary> all = demandLibraryMap.selectPage(new Page<>(page, size),dynamicQuery);
@@ -156,6 +191,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
         dynamicQuery.isNull(DemandLibrary::getSubProjectId);
+        dynamicQuery.eq(DemandLibrary::getDeleted,0);
         if(user.getId() != null) {
             dynamicQuery.eq(DemandLibrary::getCreateUserId, user.getId());
         }
@@ -195,6 +231,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
         dynamicQuery.isNull(DemandLibrary::getSubProjectId);
+        dynamicQuery.eq(DemandLibrary::getDeleted,0);
         if(StringUtils.isNotBlank(demandLibraryQuery.getKey())){
             //需求编号
             dynamicQuery.like(DemandLibrary::getDemandNumber,demandLibraryQuery.getKey());
@@ -251,6 +288,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
 
         LambdaQueryWrapper<DemandLibrary> dynamicQuery = Wrappers.<DemandLibrary>lambdaQuery();
         dynamicQuery.eq(DemandLibrary::getCreateUserId,user.getId());
+        dynamicQuery.eq(DemandLibrary::getDeleted,0);
         dynamicQuery.isNull(DemandLibrary::getSubProjectId);
         if(StringUtils.isNotBlank(demandLibraryQuery.getKey())){
             //需求编号
@@ -310,6 +348,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         //附件
         LambdaQueryWrapper<DemandAttachment> demands = new LambdaQueryWrapper<> ();
         demands.eq(DemandAttachment::getDemandId,idInt);
+        demands.eq(DemandAttachment::getDeleted,0);
         List<DemandAttachment> demandAttachmentList = demandAttachmentMapper.selectList(demands);
 
 
@@ -317,8 +356,8 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         for(DemandAttachment dic:demandAttachmentList){
             DemandAttachmentRes demandAttachmentRes = new DemandAttachmentRes();
             demandAttachmentRes.setId(dic.getId());
-            demandAttachmentRes.setSubmitter(demandLibraryMap.selectById(dic.getDemandId()).getSubmitter());
-            demandAttachmentRes.setCreateTime(demandLibraryMap.selectById(dic.getDemandId()).getSubmitTime());
+            demandAttachmentRes.setSubmitter(userMapper.selectById(fileInfoMapper.selectById(dic.getFileId()).getCreateUserId()).getName());
+            demandAttachmentRes.setCreateTime(fileInfoMapper.selectById(dic.getFileId()).getCreateTime());
             demandAttachmentRes.setName(fileInfoMapper.selectById(dic.getFileId()).getName());
             dicList.add(demandAttachmentRes);
         }
@@ -327,6 +366,7 @@ public class DemandLibraryServiceImpl extends ServiceImpl<DemandLibraryMapper, D
         //子项目
         LambdaQueryWrapper<DemandLibrary> demandLibraryMap1 = new LambdaQueryWrapper<>();
         demandLibraryMap1.eq(DemandLibrary::getSubProjectId,idInt);
+        demandLibraryMap1.eq(DemandLibrary::getDeleted,0);
         List<DemandLibrary> demandLibraryList = demandLibraryMap.selectList(demandLibraryMap1);
         demandLibraryQueryRes.setDemandB(demandLibraryList);
 

src/main/java/com/migao/service/impl/DocumentSharingServiceImpl.java

@@ -142,6 +142,7 @@ public class DocumentSharingServiceImpl extends ServiceImpl<DocumentSharingMappe
         size = size == null ? 10 : size <= 0 ? 10 : size;
 
         LambdaQueryWrapper<DocumentSharing> defaultQueryWrapper =  Wrappers.<DocumentSharing>lambdaQuery();
+        defaultQueryWrapper.eq(DocumentSharing::getDeleted,0);
         defaultQueryWrapper.orderByDesc(DocumentSharing::getCreateTime);
 
         Page<DocumentSharing> all = documentSharingMa.selectPage(new Page<>(page, size),defaultQueryWrapper);
@@ -179,6 +180,7 @@ public class DocumentSharingServiceImpl extends ServiceImpl<DocumentSharingMappe
 
         LambdaQueryWrapper<DocumentSharing> defaultQueryWrapper =  Wrappers.<DocumentSharing>lambdaQuery();
         defaultQueryWrapper.eq(DocumentSharing::getCreateUserId,user.getId());
+        defaultQueryWrapper.eq(DocumentSharing::getDeleted,0);
         defaultQueryWrapper.orderByDesc(DocumentSharing::getCreateTime);
 
         Page<DocumentSharing> all = documentSharingMa.selectPage(new Page<>(page, size),defaultQueryWrapper);
@@ -213,6 +215,8 @@ public class DocumentSharingServiceImpl extends ServiceImpl<DocumentSharingMappe
 
         LambdaQueryWrapper<DocumentSharing> defaultQueryWrapper =  Wrappers.<DocumentSharing>lambdaQuery();
         if(StringUtils.isNotBlank(documentSharingQuery.getKey())){
+            //删除状态
+            defaultQueryWrapper.eq(DocumentSharing::getDeleted,0);
             //文档编码
             defaultQueryWrapper.like(DocumentSharing::getDocumentCode,documentSharingQuery.getKey());
             //文档名称
@@ -265,6 +269,8 @@ public class DocumentSharingServiceImpl extends ServiceImpl<DocumentSharingMappe
         defaultQueryWrapper.eq(DocumentSharing::getCreateUserId,user.getId());
 
         if(StringUtils.isNotBlank(documentSharingQuery.getKey())){
+            //删除状态
+            defaultQueryWrapper.eq(DocumentSharing::getDeleted,0);
             //文档编码
             defaultQueryWrapper.like(DocumentSharing::getDocumentCode,documentSharingQuery.getKey());
             //文档名称