政策争取

src/main/java/com/qdport/controller/PolicyCaseController.java

@@ -12,12 +12,14 @@ import com.qdport.service.PolicyTodoService;
 import com.qdport.service.impl.PolicySystemService;
 import com.qdport.util.StringUtil;
 import com.qdport.vo.PolicyFileVO;
+import com.qdport.vo.PolicyStriveVO;
 import lombok.AllArgsConstructor;
 import com.qdport.entity.PolicyCase;
 import com.qdport.service.PolicyCaseService;
 import com.qdport.query.PolicyCaseQuery;
 import com.qdport.vo.PolicyCaseVO;
 import com.qdport.wrapper.PolicyCaseWrapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
@@ -27,17 +29,18 @@ import com.qdport.core.tool.api.R;
 import com.qdport.core.tool.utils.Func;
 import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 /**
-* 案例分享
-*
-* @author yuheng 
-* @since 1.0.0 2024-10-17
-*/
+ * 案例分享
+ *
+ * @author yuheng
+ * @since 1.0.0 2024-10-17
+ */
 @RestController
 @RequestMapping("qdport-zcgx/case")
 @Api(value = "案例分享", tags = "案例分享")
@@ -51,11 +54,11 @@ public class PolicyCaseController extends QdportController {
     private final PolicyStriveService policyStriveService;
 
     /**
-    * 分页
-    */
+     * 分页
+     */
     @GetMapping("page")
     @ApiOperation(value = "分页", notes = "分页")
-    public R<IPage<PolicyCaseVO>> page(@Valid PolicyCaseQuery query){
+    public R<IPage<PolicyCaseVO>> page(@Valid PolicyCaseQuery query) {
         IPage<PolicyCaseVO> page = policyCaseService.page(query);
         List<PolicyCaseVO> records = page.getRecords();
         for (PolicyCaseVO model : records) {
@@ -68,17 +71,24 @@ public class PolicyCaseController extends QdportController {
             model.setFileList(fileList);
 
             PolicyStrive strive = policyStriveService.getById(model.getStriveId());
-            model.setPolicyStrive(strive);
+            PolicyStriveVO striveVO = new PolicyStriveVO();
+            BeanUtils.copyProperties(strive, striveVO);
+            createUser = sysUserService.getById(strive.getCreateId());
+            resultMap = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
+            striveVO.setDeptName(resultMap.get("deptName"));
+            striveVO.setCompanyName(resultMap.get("companyName"));
+
+            model.setPolicyStrive(striveVO);
         }
         return R.data(page);
     }
 
     /**
-    * 详情
-    */
+     * 详情
+     */
     @GetMapping("{id}")
     @ApiOperation(value = "详情", notes = "id")
-    public R<PolicyCaseVO> get(@PathVariable("id") Long id){
+    public R<PolicyCaseVO> get(@PathVariable("id") Long id) {
         PolicyCase entity = policyCaseService.getById(id);
         PolicyCaseVO vo = PolicyCaseWrapper.build().entityVO(entity);
 
@@ -87,25 +97,34 @@ public class PolicyCaseController extends QdportController {
         vo.setDeptName(resultMap.get("deptName"));
         vo.setCompanyName(resultMap.get("companyName"));
 
-        List<PolicyFileVO> fileList = policyFileService.getFileList(entity.getId().toString(), QDPortEnum.POLICY_FILE_REFTYPE_POLICY_STRIVE.getValue());
+        PolicyStrive strive = policyStriveService.getById(entity.getStriveId());
+        PolicyStriveVO striveVO = new PolicyStriveVO();
+        BeanUtils.copyProperties(strive, striveVO);
+        createUser = sysUserService.getById(strive.getCreateId());
+        resultMap = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
+        striveVO.setDeptName(resultMap.get("deptName"));
+        striveVO.setCompanyName(resultMap.get("companyName"));
+
 
-        vo.setFileList(fileList);
+        List<PolicyFileVO> fileList = policyFileService.getFileList(strive.getId().toString(), QDPortEnum.POLICY_FILE_REFTYPE_POLICY_STRIVE.getValue());
+        striveVO.setFileList(fileList);
+        vo.setPolicyStrive(striveVO);
         return R.data(vo);
     }
 
     /**
-    * 新增
-    */
+     * 新增
+     */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyCase")
-    public R save(@RequestBody PolicyCaseVO vo){
+    public R save(@RequestBody PolicyCaseVO vo) {
         vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_ACTIVE.getValue());
         policyCaseService.save(vo);
         return R.success("保存成功");
     }
 
     @PostMapping("/saveDone")
-    @ApiOperation(value = "新增", notes = "传入PolicyStrive")
+    @ApiOperation(value = "新增", notes = "传入PolicyCase")
     @Transactional(rollbackFor = Exception.class)
     public R saveDone(@RequestBody PolicyCaseVO vo) {
         vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_DONE.getValue());
@@ -114,7 +133,7 @@ public class PolicyCaseController extends QdportController {
     }
 
     @PostMapping("/saveApprove")
-    @ApiOperation(value = "新增并且提交", notes = "传入PolicyStrive")
+    @ApiOperation(value = "新增并且提交", notes = "传入PolicyCase")
     @Transactional(rollbackFor = Exception.class)
     public R saveApprove(@RequestBody PolicyCaseVO vo) {
         if (StringUtil.isEmpty(vo.getId())) {
@@ -125,17 +144,19 @@ public class PolicyCaseController extends QdportController {
             policyCaseService.update(vo);
         }
         PolicyStrive strive = policyStriveService.getById(vo.getStriveId());
-        vo.setPolicyStrive(strive);
+        PolicyStriveVO striveVO = new PolicyStriveVO();
+        BeanUtils.copyProperties(strive, striveVO);
+        vo.setPolicyStrive(striveVO);
 
         policyTodoService.save(vo);
         return R.success("新增并且提交成功");
     }
 
     /**
-    * 修改
-    */
+     * 修改
+     */
     @PostMapping("/update")
-    public R update(@RequestBody @Valid PolicyCaseVO vo){
+    public R update(@RequestBody @Valid PolicyCaseVO vo) {
         policyCaseService.update(vo);
         return R.success("更新成功");
     }
@@ -198,13 +219,14 @@ public class PolicyCaseController extends QdportController {
 
         return R.success("更新成功");
     }
+
     /**
-    * 删除
-    */
+     * 删除
+     */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids){
-         List<Long> idList = Func.toLongList(ids);
+    public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
+        List<Long> idList = Func.toLongList(ids);
         policyCaseService.delete(idList);
         return R.success("删除成功");
     }

src/main/java/com/qdport/controller/PolicyFileController.java

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.qdport.core.tool.api.R;
 import com.qdport.core.tool.utils.Func;
+import com.qdport.core.tool.api.R;
 import com.qdport.core.boot.ctrl.QdportController;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import javax.validation.Valid;

src/main/java/com/qdport/entity/PolicyFile.java

@@ -36,13 +36,13 @@ public class PolicyFile implements Serializable {
 			type = IdType.ASSIGN_ID
 	)
 	private Long id;
-
+	@ApiModelProperty(value = "文件名称")
 	private String fileName;
-
+	@ApiModelProperty(value = "文件类型")
 	private String fileType;
-
+	@ApiModelProperty(value = "文件url域名")
 	private String fileDomain;
-
+	@ApiModelProperty(value = "文件原始名称")
 	private String originalName;
 
 	@DateTimeFormat(
@@ -51,13 +51,15 @@ public class PolicyFile implements Serializable {
 	@JsonFormat(
 			pattern = "yyyy-MM-dd HH:mm:ss"
 	)
+	@ApiModelProperty(value = "创建时间")
 	private Date createTime;
 
 	@JsonSerialize(
 			using = ToStringSerializer.class
 	)
+	@ApiModelProperty(value = "关联id")
 	private Long refId;
-
+	@ApiModelProperty(value = "关联类型")
 	private String refType;
 
 }

src/main/java/com/qdport/entity/PolicyStrive.java

@@ -201,4 +201,6 @@ public class PolicyStrive implements Serializable {
 	private Integer rewardType;
 	@ApiModelProperty(value = "是否分配")
 	private Integer isReward;
+	@ApiModelProperty(value = "是否案例")
+	private Integer isCase;
 }

src/main/java/com/qdport/query/PolicyStriveQuery.java

@@ -50,4 +50,6 @@ public class PolicyStriveQuery implements Serializable {
     private Date endCreateTime;
     @Wrapper
     private Integer rewardType;
+    @Wrapper
+    private Integer isCase;
 }

src/main/java/com/qdport/service/impl/PolicyCaseServiceImpl.java

@@ -69,9 +69,9 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
         if (StringUtil.isNotEmpty(query.getEndCreateTime())) {
             striveWrapper.lt("CREATE_TIME", query.getEndCreateTime());
         }
-        if(!striveWrapper.isEmptyOfEntity()){
+        if (!striveWrapper.isEmptyOfEntity()) {
             List<PolicyStrive> striveList = policyStriveService.list(striveWrapper);
-            if(!striveList.isEmpty()){
+            if (!striveList.isEmpty()) {
                 List<Long> idList = striveList.stream().map(PolicyStrive::getId).collect(Collectors.toList());
                 wrapper.in("STRIVE_ID", idList);
             }
@@ -80,6 +80,7 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void save(PolicyCaseVO vo) {
         String flowNo = policyFlowNoService.getFlowNo(QDPortEnum.FLOWNO_TYPE_CASE.getValue());
         vo.setCreateTime(new Date());
@@ -87,6 +88,11 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
         vo.setBusinessNo(flowNo);
         PolicyCase entity = BeanUtil.copy(vo, PolicyCase.class);
         baseMapper.insert(entity);
+
+        PolicyStrive strive = new PolicyStrive();
+        strive.setId(vo.getStriveId());
+        strive.setIsCase(1);
+        policyStriveService.updateById(strive);
     }
 
     @Override
@@ -101,6 +107,12 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
     @Transactional(rollbackFor = Exception.class)
     public void delete(List<Long> idList) {
         removeByIds(idList);
+        for (Long id : idList) {
+            PolicyStrive strive = new PolicyStrive();
+            strive.setId(id);
+            strive.setIsCase(0);
+            policyStriveService.updateById(strive);
+        }
     }
 
 }

src/main/java/com/qdport/service/impl/PolicyTodoServiceImpl.java

@@ -102,9 +102,9 @@ public class PolicyTodoServiceImpl extends ServiceImpl<PolicyTodoMapper, PolicyT
         todo.setTodoType(QDPortEnum.POLICY_TODO_TYPE_APPROVE.getValue());
         todo.setTodoUserId((long) 1);
         todo.setZcAbstractContent(policyStrive.getAbstractContent());
-        todo.setZcContactPhone(vo.getContactPhone());
-        todo.setZcCreateId(vo.getCreateId());
-        todo.setZcCreateName(vo.getCreateName());
+        todo.setZcContactPhone(policyStrive.getContactPhone());
+        todo.setZcCreateId(policyStrive.getCreateId());
+        todo.setZcCreateName(policyStrive.getCreateName());
         todo.setZcCreateTime(vo.getCreateTime());
         todo.setZcName(policyStrive.getName());
         todo.setZcType(policyStrive.getZcType());

src/main/java/com/qdport/vo/PolicyCaseVO.java

@@ -24,5 +24,5 @@ public class PolicyCaseVO extends PolicyCase {
 
 	private List<PolicyFileVO> fileList = new ArrayList<>();
 
-	private PolicyStrive policyStrive;
+	private PolicyStriveVO policyStrive;
 }

src/main/java/com/qdport/vo/PolicyShareVO.java

@@ -1,6 +1,7 @@
 package com.qdport.vo;
 
 import com.qdport.entity.PolicyShare;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,12 +18,12 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class PolicyShareVO extends PolicyShare {
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty(value = "部门名称")
     private String deptName;
-
+    @ApiModelProperty(value = "公司名称")
     private String companyName;
-
+    @ApiModelProperty(value = "附件")
     private List<PolicyFileVO> fileList = new ArrayList<>();
-
+    @ApiModelProperty(value = "excel的远程路径")
     private String excelUrl;
 }

src/main/java/com/qdport/vo/PolicyStriveVO.java

@@ -1,4 +1,5 @@
 package com.qdport.vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.qdport.entity.PolicyStrive;
@@ -17,11 +18,12 @@ import java.util.List;
 public class PolicyStriveVO extends PolicyStrive {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "部门名称")
 	private String deptName;
-
+	@ApiModelProperty(value = "公司名称")
 	private String companyName;
-
+	@ApiModelProperty(value = "附件")
 	private List<PolicyFileVO> fileList = new ArrayList<>();
-
+	@ApiModelProperty(value = "excel的远程路径")
 	private String excelUrl;
 }

src/main/java/com/qdport/vo/PolicyTodoVO.java

@@ -1,4 +1,5 @@
 package com.qdport.vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.qdport.entity.PolicyTodo;
@@ -12,9 +13,9 @@ import com.qdport.entity.PolicyTodo;
 @EqualsAndHashCode(callSuper = true)
 public class PolicyTodoVO extends PolicyTodo {
 	private static final long serialVersionUID = 1L;
-
+	@ApiModelProperty(value = "部门名称")
 	private String zcDeptName;
-
+	@ApiModelProperty(value = "公司名称")
 	private String zcCompanyName;
 
 }

src/main/resources/application-dev.yml

@@ -62,9 +62,9 @@ oss:
   enabled: true
   name: minio
   tenant-mode: false
-  endpoint: http://8.142.210.43:9000
-  access-key: R765A7R2UCSF0VNH1EEQ
-  secret-key: +O76+jRxIOLqiO8yKdpm8dZ5+mUStxAniQjKaZNo
+  endpoint: http://10.236.2.146:9000
+  access-key: gOFl2vtLfL4YMIF1yIcn
+  secret-key: viXXpJITrFsy0br70mNR6cLK7NNPm2hp6mAoKdDc
   bucketName: qdg
 
 flowable:

src/main/resources/application-test.yml

@@ -59,13 +59,13 @@ qdport:
       - /gen/**
 
 oss:
-  enabled: false
+  enabled: true
   name: minio
   tenant-mode: false
-  endpoint: 127.0.0.0
-  access-key: 你的项目配置
-  secret-key: 你的项目配置
-  bucketName: 你的项目配置
+  endpoint: http://8.142.210.43:9000
+  access-key: R765A7R2UCSF0VNH1EEQ
+  secret-key: +O76+jRxIOLqiO8yKdpm8dZ5+mUStxAniQjKaZNo
+  bucketName: qdg
 
 flowable:
   activity-font-name: \u5B8B\u4F53