@@ -93,26 +93,6 @@ | |||||
<groupId>org.apache.httpcomponents</groupId> | <groupId>org.apache.httpcomponents</groupId> | ||||
<artifactId>httpclient</artifactId> | <artifactId>httpclient</artifactId> | ||||
</dependency> | </dependency> | ||||
<!-- jwt --> | |||||
<dependency> | |||||
<groupId>com.auth0</groupId> | |||||
<artifactId>java-jwt</artifactId> | |||||
</dependency> | |||||
<dependency> | |||||
<groupId>io.jsonwebtoken</groupId> | |||||
<artifactId>jjwt-api</artifactId> | |||||
<version>${jjwt.version}</version> | |||||
</dependency> | |||||
<dependency> | |||||
<groupId>io.jsonwebtoken</groupId> | |||||
<artifactId>jjwt-impl</artifactId> | |||||
<version>${jjwt.version}</version> | |||||
</dependency> | |||||
<dependency> | |||||
<groupId>io.jsonwebtoken</groupId> | |||||
<artifactId>jjwt-jackson</artifactId> | |||||
<version>${jjwt.version}</version> | |||||
</dependency> | |||||
<dependency> | <dependency> | ||||
<groupId>org.apache.poi</groupId> | <groupId>org.apache.poi</groupId> | ||||
<artifactId>poi</artifactId> | <artifactId>poi</artifactId> | ||||
@@ -1,5 +1,6 @@ | |||||
package com.ningdatech.pmapi.common.statemachine.event; | package com.ningdatech.pmapi.common.statemachine.event; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | |||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Getter; | import lombok.Getter; | ||||
import lombok.NoArgsConstructor; | import lombok.NoArgsConstructor; | ||||
@@ -25,114 +26,114 @@ public enum ProjectStatusChangeEvent { | |||||
/** | /** | ||||
* 项目申报提交(项目状态进入:单位内部审核中) | * 项目申报提交(项目状态进入:单位内部审核中) | ||||
*/ | */ | ||||
PROJECT_APPLICATION_SUBMIT(10015, null, null), | |||||
PROJECT_APPLICATION_SUBMIT( ProjectStatusEnum.TO_BE_DECLARED.getCode(), null, null), | |||||
/** | /** | ||||
* 单位内部审核驳回(项目状态进入:单位内部审核不通过) | * 单位内部审核驳回(项目状态进入:单位内部审核不通过) | ||||
*/ | */ | ||||
UNDER_INTERNAL_REJECT(null, 10001, null), | |||||
UNDER_INTERNAL_REJECT(null, ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode(), null), | |||||
/** | /** | ||||
* 单位内部审核通过(项目状态进入:待预审) | * 单位内部审核通过(项目状态进入:待预审) | ||||
*/ | */ | ||||
UNDER_INTERNAL_PASS(10001, null, null), | |||||
UNDER_INTERNAL_PASS(ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode(), null, null), | |||||
/** | /** | ||||
* 预审申报(项目状态进入:待预审选择,有判断条件:市级项目且申报金额大于1000万项目状态变为:省级部门联审中;否则项目状态变为:预审中) | * 预审申报(项目状态进入:待预审选择,有判断条件:市级项目且申报金额大于1000万项目状态变为:省级部门联审中;否则项目状态变为:预审中) | ||||
*/ | */ | ||||
PRELIMINARY_REVIEW_DECLARE(10003, null, null), | |||||
PRELIMINARY_REVIEW_DECLARE(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode(), null, null), | |||||
/** | /** | ||||
* 省级部门联审不通过(项目状态变为:省级部门联审不通过) | * 省级部门联审不通过(项目状态变为:省级部门联审不通过) | ||||
*/ | */ | ||||
PROVINCIAL_DEPARTMENT_REVIEW_REJECT(null, 10004, null), | |||||
PROVINCIAL_DEPARTMENT_REVIEW_REJECT(null, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode(), null), | |||||
/** | /** | ||||
* 省级部门联审通过(项目状态变为:预审中) | * 省级部门联审通过(项目状态变为:预审中) | ||||
*/ | */ | ||||
PROVINCIAL_DEPARTMENT_REVIEW_PASS(10004, null, null), | |||||
PROVINCIAL_DEPARTMENT_REVIEW_PASS(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode(), null, null), | |||||
/** | /** | ||||
* 预审驳回(项目状态变为:预审不通过) | * 预审驳回(项目状态变为:预审不通过) | ||||
*/ | */ | ||||
PRELIMINARY_REVIEW_REJECT(null, 10006, null), | |||||
PRELIMINARY_REVIEW_REJECT(null, ProjectStatusEnum.PRE_APPLYING.getCode(), null), | |||||
/** | /** | ||||
* 预审通过(项目状态变为:部门联审中) | * 预审通过(项目状态变为:部门联审中) | ||||
*/ | */ | ||||
PRELIMINARY_REVIEW_PASS(10006, null, null), | |||||
PRELIMINARY_REVIEW_PASS(ProjectStatusEnum.PRE_APPLYING.getCode(), null, null), | |||||
/** | /** | ||||
* 部门联审驳回(项目状态变为:部门联审不通过) | * 部门联审驳回(项目状态变为:部门联审不通过) | ||||
*/ | */ | ||||
DEPARTMENT_UNITED_REVIEW_REJECT(null, 10008, null), | |||||
DEPARTMENT_UNITED_REVIEW_REJECT(null, ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW.getCode(), null), | |||||
/** | /** | ||||
* 部门联审通过(项目状态变为:年度计划中) | * 部门联审通过(项目状态变为:年度计划中) | ||||
*/ | */ | ||||
DEPARTMENT_UNITED_REVIEW_PASS(10008, null, null), | |||||
DEPARTMENT_UNITED_REVIEW_PASS(ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW.getCode(), null, null), | |||||
/** | /** | ||||
* 年度计划暂缓(项目状态变为:被暂缓) | * 年度计划暂缓(项目状态变为:被暂缓) | ||||
*/ | */ | ||||
ANNUAL_PLAN_SUSPEND(null, 10010, null), | |||||
ANNUAL_PLAN_SUSPEND(null, ProjectStatusEnum.IN_THE_ANNUAL_PLAN.getCode(), null), | |||||
/** | /** | ||||
* 年度计划项目开启方案申报(项目状态变为:方案待申报) | * 年度计划项目开启方案申报(项目状态变为:方案待申报) | ||||
*/ | */ | ||||
ANNUAL_PLAN_PROJECT_OPEN_PLAN_DECLARE(10010, null, null), | |||||
ANNUAL_PLAN_PROJECT_OPEN_PLAN_DECLARE(ProjectStatusEnum.IN_THE_ANNUAL_PLAN.getCode(), null, null), | |||||
/** | /** | ||||
* 申报方案(项目状态变为:方案评审中) | * 申报方案(项目状态变为:方案评审中) | ||||
*/ | */ | ||||
DECLARE_PLAN(10016, null, null), | |||||
DECLARE_PLAN( ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode(), null, null), | |||||
/** | /** | ||||
* 方案评审驳回(项目状态变为:方案评审不通过) | * 方案评审驳回(项目状态变为:方案评审不通过) | ||||
*/ | */ | ||||
PLAN_REVIEW_REJECT(null, 10012, null), | |||||
PLAN_REVIEW_REJECT(null, ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode(), null), | |||||
/** | /** | ||||
* 方案评审通过(项目状态变为:待立项批复) | * 方案评审通过(项目状态变为:待立项批复) | ||||
*/ | */ | ||||
PLAN_REVIEW_PASS(10012, null, null), | |||||
PLAN_REVIEW_PASS(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode(), null, null), | |||||
/** | /** | ||||
* 立项批复(项目状态变为:已立项-待采购) | * 立项批复(项目状态变为:已立项-待采购) | ||||
*/ | */ | ||||
PROJECT_APPROVAL(10014, null, null), | |||||
PROJECT_APPROVAL(ProjectStatusEnum.TO_BE_APPROVED.getCode(), null, null), | |||||
/** | /** | ||||
* 采购备案(项目状态变为:建设中) | * 采购备案(项目状态变为:建设中) | ||||
*/ | */ | ||||
PURCHASE_PUT_ON_RECORD(20001, null, null), | |||||
PURCHASE_PUT_ON_RECORD(ProjectStatusEnum.TO_BE_PURCHASED.getCode(), null, null), | |||||
/** | /** | ||||
* 初验备案(项目状态变为:待终验) | * 初验备案(项目状态变为:待终验) | ||||
*/ | */ | ||||
PRELIMINARY_ACCEPTANCE_PUT_ON_RECORD(20002, null, null), | |||||
PRELIMINARY_ACCEPTANCE_PUT_ON_RECORD(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode(), null, null), | |||||
/** | /** | ||||
* 终验申请(项目状态变为:终验审核中) | * 终验申请(项目状态变为:终验审核中) | ||||
*/ | */ | ||||
FINAL_ACCEPTANCE_APPLICATION(20003, null, null), | |||||
FINAL_ACCEPTANCE_APPLICATION(ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode(), null, null), | |||||
/** | /** | ||||
* 终验审核不通过(项目状态变为:终验审核不通过) | * 终验审核不通过(项目状态变为:终验审核不通过) | ||||
*/ | */ | ||||
FINAL_ACCEPTANCE_REJECT(null, 20004, null), | |||||
FINAL_ACCEPTANCE_REJECT(null, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode(), null), | |||||
/** | /** | ||||
* 终验审核通过(项目状态变为:已归档) | * 终验审核通过(项目状态变为:已归档) | ||||
*/ | */ | ||||
FINAL_ACCEPTANCE_PASS(20004, null, null), | |||||
FINAL_ACCEPTANCE_PASS(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode(), null, null), | |||||
// 下个节点还未提交审核意见时,流程发起人和前一个审核人可以点击撤回 | // 下个节点还未提交审核意见时,流程发起人和前一个审核人可以点击撤回 | ||||
/** | /** | ||||
* 单位内部审核中时被撤回(项目状态进入:待申报) | * 单位内部审核中时被撤回(项目状态进入:待申报) | ||||
*/ | */ | ||||
UNDER_INTERNAL_WITHDRAW(null, null, 10001), | |||||
UNDER_INTERNAL_WITHDRAW(null, null, ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode()), | |||||
/** | /** | ||||
* 省级部门联审中时被撤回(项目状态进入:待预审) | * 省级部门联审中时被撤回(项目状态进入:待预审) | ||||
*/ | */ | ||||
JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW(null, null, 10004), | |||||
JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW(null, null, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()), | |||||
/** | /** | ||||
* 预审中时被撤回(项目状态进入:待预审选择,,有判断条件:市级项目且申报金额大于1000万项目状态变为:省级部门联审中;否则项目状态变为:预审中) | * 预审中时被撤回(项目状态进入:待预审选择,,有判断条件:市级项目且申报金额大于1000万项目状态变为:省级部门联审中;否则项目状态变为:预审中) | ||||
*/ | */ | ||||
PRE_APPLYING_WITHDRAW(null, null, 10006), | |||||
PRE_APPLYING_WITHDRAW(null, null, ProjectStatusEnum.PRE_APPLYING.getCode()), | |||||
/** | /** | ||||
* 部门联审中时被撤回(项目状态进入:预审中) | * 部门联审中时被撤回(项目状态进入:预审中) | ||||
*/ | */ | ||||
DEPARTMENT_JOINT_REVIEW_WITHDRAW(null, null, 10008), | |||||
DEPARTMENT_JOINT_REVIEW_WITHDRAW(null, null, ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW.getCode()), | |||||
/** | /** | ||||
* 方案评审中时被撤回(项目状态进入:方案待申报) | * 方案评审中时被撤回(项目状态进入:方案待申报) | ||||
*/ | */ | ||||
SCHEME_UNDER_REVIEW_WITHDRAW(null, null, 10012), | |||||
SCHEME_UNDER_REVIEW_WITHDRAW(null, null, ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode()), | |||||
/** | /** | ||||
* 终验审核中时被撤回(项目状态进入:待终验) | * 终验审核中时被撤回(项目状态进入:待终验) | ||||
*/ | */ | ||||
FINAL_ACCEPTANCE_IS_UNDER_REVIEW_WITHDRAW(null, null, 20004); | |||||
FINAL_ACCEPTANCE_IS_UNDER_REVIEW_WITHDRAW(null, null, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode()); | |||||
private Integer passProjectStatusCode; | private Integer passProjectStatusCode; | ||||
private Integer rejectProjectStatusCode; | private Integer rejectProjectStatusCode; | ||||
@@ -1,9 +1,11 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | package com.ningdatech.pmapi.projectdeclared.controller; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq; | ||||
import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage; | import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | ||||
@@ -16,6 +18,8 @@ import org.springframework.beans.BeanUtils; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
/** | /** | ||||
* @Classname ConstructionPlanController | * @Classname ConstructionPlanController | ||||
* @Description 建设方案申报 | * @Description 建设方案申报 | ||||
@@ -44,4 +48,10 @@ public class ConstructionPlanController { | |||||
String instanceId = constructionPlanManage.startTheProcess(dto); | String instanceId = constructionPlanManage.startTheProcess(dto); | ||||
return "建设方案申报 【" + instanceId + "】 成功"; | return "建设方案申报 【" + instanceId + "】 成功"; | ||||
} | } | ||||
@GetMapping("/export") | |||||
@ApiOperation("可申报建设方案项目列表导出") | |||||
public void exportList(ConstrctionPlanListReq planReq, HttpServletResponse response){ | |||||
ExcelDownUtil.downXls(response,planReq,constructionPlanManage::exportList); | |||||
} | |||||
} | } |
@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; | |||||
import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.projectdeclared.contants.DeclaredProjectContant; | import com.ningdatech.pmapi.projectdeclared.contants.DeclaredProjectContant; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectListParamDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectListParamDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
@@ -9,6 +10,7 @@ import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectDraftSaveDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO; | import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO; | ||||
import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; | import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
@@ -17,6 +19,8 @@ import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
/** | /** | ||||
* @Classname DeclaredProjectController | * @Classname DeclaredProjectController | ||||
* @Description 申报项目 | * @Description 申报项目 | ||||
@@ -68,4 +72,10 @@ public class DeclaredProjectController { | |||||
String instanceId = declaredProjectManage.startTheProcess(dto); | String instanceId = declaredProjectManage.startTheProcess(dto); | ||||
return "启动流程实例 【" + instanceId + "】 成功"; | return "启动流程实例 【" + instanceId + "】 成功"; | ||||
} | } | ||||
@GetMapping("/export") | |||||
@ApiOperation("申报项目列表导出") | |||||
public void exportList(ProjectListReq req, HttpServletResponse response){ | |||||
ExcelDownUtil.downXls(response,req,declaredProjectManage::exportList); | |||||
} | |||||
} | } |
@@ -1,6 +1,7 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | package com.ningdatech.pmapi.projectdeclared.controller; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq; | ||||
import com.ningdatech.pmapi.projectdeclared.manage.PrequalificationDeclaredProjectManage; | import com.ningdatech.pmapi.projectdeclared.manage.PrequalificationDeclaredProjectManage; | ||||
@@ -16,6 +17,8 @@ import org.springframework.beans.BeanUtils; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
/** | /** | ||||
* @Classname PrequalificationDeclaredController | * @Classname PrequalificationDeclaredController | ||||
* @Description 预审申报 | * @Description 预审申报 | ||||
@@ -43,4 +46,10 @@ public class PrequalificationDeclaredController { | |||||
public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { | public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { | ||||
return prequalificationDeclaredProjectManage.startTheProcess(dto); | return prequalificationDeclaredProjectManage.startTheProcess(dto); | ||||
} | } | ||||
@GetMapping("/export") | |||||
@ApiOperation("可预审申报项目列表导出") | |||||
public void exportList(PrequalificationDeclaredListReq preReq, HttpServletResponse response){ | |||||
ExcelDownUtil.downXls(response,preReq,prequalificationDeclaredProjectManage::exportList); | |||||
} | |||||
} | } |
@@ -1,10 +1,12 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | package com.ningdatech.pmapi.projectdeclared.controller; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; | ||||
import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; | import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; | ||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
@@ -13,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.validation.annotation.Validated; | import org.springframework.validation.annotation.Validated; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
import java.util.Arrays; | import java.util.Arrays; | ||||
/** | /** | ||||
@@ -43,4 +46,10 @@ public class ProjectAdjustmentController { | |||||
String instanceId = projectAdjustmentManage.adjustment(dto); | String instanceId = projectAdjustmentManage.adjustment(dto); | ||||
return "项目内容调整并且重新申报 【" + instanceId + "】 成功"; | return "项目内容调整并且重新申报 【" + instanceId + "】 成功"; | ||||
} | } | ||||
@GetMapping("/export") | |||||
@ApiOperation("项目内容调整列表导出") | |||||
public void exportList(AdjustmentListReq preReq, HttpServletResponse response){ | |||||
ExcelDownUtil.downXls(response,preReq,projectAdjustmentManage::exportList); | |||||
} | |||||
} | } |
@@ -1,18 +1,29 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.manage; | package com.ningdatech.pmapi.projectdeclared.manage; | ||||
import com.alibaba.excel.EasyExcel; | |||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.alibaba.fastjson.TypeReference; | import com.alibaba.fastjson.TypeReference; | ||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.basic.util.NdDateUtils; | |||||
import com.ningdatech.pmapi.common.constant.CommonConst; | |||||
import com.ningdatech.pmapi.common.constant.RegionConst; | import com.ningdatech.pmapi.common.constant.RegionConst; | ||||
import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | ||||
import com.ningdatech.pmapi.common.helper.UserInfoHelper; | import com.ningdatech.pmapi.common.helper.UserInfoHelper; | ||||
import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.common.util.ExcelExportStyle; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.ConstructionPlanExportDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.PretrialDeclaredExportDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | |||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
@@ -37,10 +48,14 @@ import org.springframework.beans.BeanUtils; | |||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
import java.io.IOException; | |||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.Collections; | import java.util.Collections; | ||||
import java.util.List; | |||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Objects; | import java.util.Objects; | ||||
import java.util.stream.Collectors; | |||||
/** | /** | ||||
* @Classname DeclaredProjectManage | * @Classname DeclaredProjectManage | ||||
@@ -176,4 +191,48 @@ public class ConstructionPlanManage { | |||||
req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | ||||
return projectLibManage.projectLibList(req); | return projectLibManage.projectLibList(req); | ||||
} | } | ||||
public void exportList(HttpServletResponse response, ConstrctionPlanListReq planReq) { | |||||
//限定参数 复制bean | |||||
ProjectListReq req = new ProjectListReq(); | |||||
BeanUtils.copyProperties(planReq,req); | |||||
//项目阶段 状态 已定 方案待申报 | |||||
req.setStage(ProjectStatusEnum.NOT_APPROVED.getCode()); | |||||
req.setStatus(ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode()); | |||||
Long userId = LoginUserUtil.getUserId(); | |||||
VUtils.isTrue(Objects.isNull(userId)).throwMessage("获取登录用户失败!"); | |||||
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId); | |||||
//放入用户的单位 | |||||
req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | |||||
req.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | |||||
req.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | |||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | |||||
Page<Project> page = projectService.page(req.page(), query); | |||||
List<Project> records = page.getRecords(); | |||||
List<ConstructionPlanExportDTO> collect = records.stream().map(r -> { | |||||
ConstructionPlanExportDTO exportDTO = new ConstructionPlanExportDTO(); | |||||
BeanUtils.copyProperties(r, exportDTO); | |||||
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); | |||||
String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm"); | |||||
exportDTO.setCreateOn(createOnStr); | |||||
return exportDTO; | |||||
}).collect(Collectors.toList()); | |||||
for (int i = 0; i < collect.size(); i++) { | |||||
collect.get(i).setSerialNumber(i + 1); | |||||
} | |||||
String fileName = "建设方案申报项目列表"; | |||||
ExcelDownUtil.setFileName(fileName,response); | |||||
//数据导出处理函数 | |||||
try { | |||||
EasyExcel.write(response.getOutputStream(), ConstructionPlanExportDTO.class) | |||||
.autoCloseStream(false) | |||||
.registerWriteHandler(ExcelExportStyle.formalStyle()) | |||||
.sheet(fileName) | |||||
.doWrite(collect); | |||||
} catch (IOException e) { | |||||
throw new RuntimeException(e); | |||||
} | |||||
} | |||||
} | } |
@@ -1,6 +1,7 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.manage; | package com.ningdatech.pmapi.projectdeclared.manage; | ||||
import cn.hutool.core.collection.CollUtil; | import cn.hutool.core.collection.CollUtil; | ||||
import com.alibaba.excel.EasyExcel; | |||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.alibaba.fastjson.TypeReference; | import com.alibaba.fastjson.TypeReference; | ||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | ||||
@@ -8,23 +9,32 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.basic.util.NdDateUtils; | |||||
import com.ningdatech.pmapi.common.constant.CommonConst; | |||||
import com.ningdatech.pmapi.common.constant.RegionConst; | import com.ningdatech.pmapi.common.constant.RegionConst; | ||||
import com.ningdatech.pmapi.common.enumeration.CommonEnum; | import com.ningdatech.pmapi.common.enumeration.CommonEnum; | ||||
import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | ||||
import com.ningdatech.pmapi.common.helper.RegionCacheHelper; | import com.ningdatech.pmapi.common.helper.RegionCacheHelper; | ||||
import com.ningdatech.pmapi.common.helper.UserInfoHelper; | import com.ningdatech.pmapi.common.helper.UserInfoHelper; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.common.util.ExcelExportStyle; | |||||
import com.ningdatech.pmapi.organization.model.entity.DingOrganization; | import com.ningdatech.pmapi.organization.model.entity.DingOrganization; | ||||
import com.ningdatech.pmapi.organization.service.IDingOrganizationService; | import com.ningdatech.pmapi.organization.service.IDingOrganizationService; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.*; | import com.ningdatech.pmapi.projectdeclared.model.dto.*; | ||||
import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft; | import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft; | ||||
import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO; | import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO; | ||||
import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService; | import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | |||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalExportDTO; | |||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; | import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; | ||||
import com.ningdatech.pmapi.projectlib.model.po.ProjectRenewalFundDeclarationPO; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | ||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; | import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; | ||||
@@ -50,6 +60,8 @@ import org.springframework.beans.BeanUtils; | |||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
import java.io.IOException; | |||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.*; | import java.util.*; | ||||
import java.util.stream.Collectors; | import java.util.stream.Collectors; | ||||
@@ -361,4 +373,44 @@ public class DeclaredProjectManage { | |||||
req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | ||||
return projectlibManager.projectLibList(req); | return projectlibManager.projectLibList(req); | ||||
} | } | ||||
public void exportList(HttpServletResponse response, ProjectListReq param) { | |||||
Long userId = LoginUserUtil.getUserId(); | |||||
VUtils.isTrue(Objects.isNull(userId)).throwMessage("获取登录用户失败!"); | |||||
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId); | |||||
//放入用户的单位 | |||||
param.setBuildOrgCode(userFullInfo.getOrganizationCode()); | |||||
param.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | |||||
param.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | |||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(param); | |||||
Page<Project> page = projectService.page(param.page(), query); | |||||
List<Project> records = page.getRecords(); | |||||
List<DeclaredProjectExportDTO> collect = records.stream().map(r -> { | |||||
DeclaredProjectExportDTO exportDTO = new DeclaredProjectExportDTO(); | |||||
BeanUtils.copyProperties(r, exportDTO); | |||||
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); | |||||
exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus())); | |||||
String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm"); | |||||
exportDTO.setCreateOn(createOnStr); | |||||
return exportDTO; | |||||
}).collect(Collectors.toList()); | |||||
for (int i = 0; i < collect.size(); i++) { | |||||
collect.get(i).setSerialNumber(i + 1); | |||||
} | |||||
String fileName = "项目申报列表"; | |||||
ExcelDownUtil.setFileName(fileName,response); | |||||
//数据导出处理函数 | |||||
try { | |||||
EasyExcel.write(response.getOutputStream(), DeclaredProjectExportDTO.class) | |||||
.autoCloseStream(false) | |||||
.registerWriteHandler(ExcelExportStyle.formalStyle()) | |||||
.sheet(fileName) | |||||
.doWrite(collect); | |||||
} catch (IOException e) { | |||||
throw new RuntimeException(e); | |||||
} | |||||
} | |||||
} | } |
@@ -1,17 +1,28 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.manage; | package com.ningdatech.pmapi.projectdeclared.manage; | ||||
import com.alibaba.excel.EasyExcel; | |||||
import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
import com.alibaba.fastjson.TypeReference; | import com.alibaba.fastjson.TypeReference; | ||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.basic.util.NdDateUtils; | |||||
import com.ningdatech.pmapi.common.constant.CommonConst; | |||||
import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | ||||
import com.ningdatech.pmapi.common.helper.UserInfoHelper; | import com.ningdatech.pmapi.common.helper.UserInfoHelper; | ||||
import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.common.util.ExcelExportStyle; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectExportDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.PretrialDeclaredExportDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | |||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
@@ -36,10 +47,14 @@ import org.springframework.beans.BeanUtils; | |||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
import java.io.IOException; | |||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.Collections; | import java.util.Collections; | ||||
import java.util.List; | |||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Objects; | import java.util.Objects; | ||||
import java.util.stream.Collectors; | |||||
/** | /** | ||||
* @Classname ProqualificationDeclaredProjectManage | * @Classname ProqualificationDeclaredProjectManage | ||||
@@ -208,4 +223,47 @@ public class PrequalificationDeclaredProjectManage { | |||||
req.setSuperOrgCode(userFullInfo.getOrganizationCode()); | req.setSuperOrgCode(userFullInfo.getOrganizationCode()); | ||||
return projectLibManage.projectLibList(req); | return projectLibManage.projectLibList(req); | ||||
} | } | ||||
public void exportList(HttpServletResponse response, PrequalificationDeclaredListReq preReq) { | |||||
ProjectListReq req = new ProjectListReq(); | |||||
BeanUtils.copyProperties(preReq,req); | |||||
//项目阶段 状态 已定 待预审 | |||||
req.setStage(ProjectStatusEnum.NOT_APPROVED.getCode()); | |||||
req.setStatus(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()); | |||||
Long userId = LoginUserUtil.getUserId(); | |||||
VUtils.isTrue(Objects.isNull(userId)).throwMessage("获取登录用户失败!"); | |||||
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId); | |||||
//放入用户的单位 | |||||
req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | |||||
req.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | |||||
req.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | |||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | |||||
Page<Project> page = projectService.page(req.page(), query); | |||||
List<Project> records = page.getRecords(); | |||||
List<PretrialDeclaredExportDTO> collect = records.stream().map(r -> { | |||||
PretrialDeclaredExportDTO exportDTO = new PretrialDeclaredExportDTO(); | |||||
BeanUtils.copyProperties(r, exportDTO); | |||||
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); | |||||
String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm"); | |||||
exportDTO.setCreateOn(createOnStr); | |||||
return exportDTO; | |||||
}).collect(Collectors.toList()); | |||||
for (int i = 0; i < collect.size(); i++) { | |||||
collect.get(i).setSerialNumber(i + 1); | |||||
} | |||||
String fileName = "预审申报项目列表"; | |||||
ExcelDownUtil.setFileName(fileName,response); | |||||
//数据导出处理函数 | |||||
try { | |||||
EasyExcel.write(response.getOutputStream(), PretrialDeclaredExportDTO.class) | |||||
.autoCloseStream(false) | |||||
.registerWriteHandler(ExcelExportStyle.formalStyle()) | |||||
.sheet(fileName) | |||||
.doWrite(collect); | |||||
} catch (IOException e) { | |||||
throw new RuntimeException(e); | |||||
} | |||||
} | |||||
} | } |
@@ -1,14 +1,25 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.manage; | package com.ningdatech.pmapi.projectdeclared.manage; | ||||
import cn.hutool.core.collection.CollUtil; | import cn.hutool.core.collection.CollUtil; | ||||
import com.alibaba.excel.EasyExcel; | |||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; | import com.baomidou.mybatisplus.core.toolkit.Wrappers; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.basic.util.NdDateUtils; | |||||
import com.ningdatech.pmapi.common.constant.CommonConst; | |||||
import com.ningdatech.pmapi.common.helper.UserInfoHelper; | import com.ningdatech.pmapi.common.helper.UserInfoHelper; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | |||||
import com.ningdatech.pmapi.common.util.ExcelExportStyle; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectExportDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectAdjustmentExportDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; | import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq; | ||||
import com.ningdatech.pmapi.projectdeclared.utils.ReStartProcessMapUtil; | import com.ningdatech.pmapi.projectdeclared.utils.ReStartProcessMapUtil; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | |||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
@@ -26,6 +37,8 @@ import org.springframework.beans.BeanUtils; | |||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
import javax.servlet.http.HttpServletResponse; | |||||
import java.io.IOException; | |||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.Arrays; | import java.util.Arrays; | ||||
import java.util.List; | import java.util.List; | ||||
@@ -131,4 +144,55 @@ public class ProjectAdjustmentManage { | |||||
req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | ||||
return projectLibManage.projectLibList(req); | return projectLibManage.projectLibList(req); | ||||
} | } | ||||
public void exportList(HttpServletResponse response, AdjustmentListReq preReq) { | |||||
//限定参数 复制bean | |||||
ProjectListReq req = new ProjectListReq(); | |||||
BeanUtils.copyProperties(preReq,req); | |||||
//项目阶段 状态 已定 方案待申报 | |||||
req.setStageList(Arrays.asList(ProjectStatusEnum.NOT_APPROVED.getCode())); | |||||
//只有 单位内部审核不通过 省级联审不通过 预审不通过 建设方案不通过 4种状态 | |||||
req.setStatusList(Arrays.asList(ProjectStatusEnum.UNDER_INTERNAL_AUDIT_NOT_PASS.getCode(), | |||||
ProjectStatusEnum.PREQUALIFICATION_FAILED.getCode(), | |||||
ProjectStatusEnum.THE_JOINT_REVIEW_OF_PROVINCIAL_DEPARTMENTS_FAILED.getCode(), | |||||
ProjectStatusEnum.SCHEME_REVIEW_FAILED.getCode())); | |||||
Long userId = LoginUserUtil.getUserId(); | |||||
VUtils.isTrue(Objects.isNull(userId)).throwMessage("获取登录用户失败!"); | |||||
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userId); | |||||
//放入用户的单位 | |||||
req.setBuildOrgCode(userFullInfo.getOrganizationCode()); | |||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | |||||
Page<Project> page = projectService.page(req.page(), query); | |||||
req.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | |||||
req.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | |||||
List<Project> records = page.getRecords(); | |||||
List<ProjectAdjustmentExportDTO> collect = records.stream().map(r -> { | |||||
ProjectAdjustmentExportDTO exportDTO = new ProjectAdjustmentExportDTO(); | |||||
BeanUtils.copyProperties(r, exportDTO); | |||||
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); | |||||
exportDTO.setStatusName(ProjectStatusEnum.getDesc(r.getStatus())); | |||||
String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm"); | |||||
exportDTO.setCreateOn(createOnStr); | |||||
return exportDTO; | |||||
}).collect(Collectors.toList()); | |||||
for (int i = 0; i < collect.size(); i++) { | |||||
collect.get(i).setSerialNumber(i + 1); | |||||
} | |||||
String fileName = "项目内容调整列表"; | |||||
ExcelDownUtil.setFileName(fileName,response); | |||||
//数据导出处理函数 | |||||
try { | |||||
EasyExcel.write(response.getOutputStream(), ProjectAdjustmentExportDTO.class) | |||||
.autoCloseStream(false) | |||||
.registerWriteHandler(ExcelExportStyle.formalStyle()) | |||||
.sheet(fileName) | |||||
.doWrite(collect); | |||||
} catch (IOException e) { | |||||
throw new RuntimeException(e); | |||||
} | |||||
} | |||||
} | } |
@@ -0,0 +1,42 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.model.dto; | |||||
import java.math.BigDecimal; | |||||
import com.alibaba.excel.annotation.ExcelProperty; | |||||
import lombok.AllArgsConstructor; | |||||
import lombok.Builder; | |||||
import lombok.Data; | |||||
import lombok.NoArgsConstructor; | |||||
/** | |||||
* 建设方案申报列表导出实体类 | |||||
* | |||||
* @author CMM | |||||
* @since 2023/03/10 10:20 | |||||
*/ | |||||
@Data | |||||
@Builder | |||||
@NoArgsConstructor | |||||
@AllArgsConstructor | |||||
public class ConstructionPlanExportDTO { | |||||
@ExcelProperty(value = "序号",index = 0) | |||||
private Integer serialNumber; | |||||
@ExcelProperty("项目名称") | |||||
private String projectName; | |||||
@ExcelProperty("项目类型") | |||||
private String projectTypeName; | |||||
@ExcelProperty("申报金额(万元)") | |||||
private BigDecimal declareAmount; | |||||
@ExcelProperty("预算年度") | |||||
private Integer projectYear; | |||||
@ExcelProperty("创建时间") | |||||
private String createOn; | |||||
} |
@@ -0,0 +1,45 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.model.dto; | |||||
import com.alibaba.excel.annotation.ExcelProperty; | |||||
import com.fasterxml.jackson.annotation.JsonFormat; | |||||
import lombok.AllArgsConstructor; | |||||
import lombok.Builder; | |||||
import lombok.Data; | |||||
import lombok.NoArgsConstructor; | |||||
import java.math.BigDecimal; | |||||
import java.time.LocalDateTime; | |||||
/** | |||||
* 申报项目列表导出实体类 | |||||
* | |||||
* @author CMM | |||||
* @since 2023/03/10 10:20 | |||||
*/ | |||||
@Data | |||||
@Builder | |||||
@NoArgsConstructor | |||||
@AllArgsConstructor | |||||
public class DeclaredProjectExportDTO { | |||||
@ExcelProperty(value = "序号",index = 0) | |||||
private Integer serialNumber; | |||||
@ExcelProperty("项目名称") | |||||
private String projectName; | |||||
@ExcelProperty("项目类型") | |||||
private String projectTypeName; | |||||
@ExcelProperty("申报金额(万元)") | |||||
private BigDecimal declareAmount; | |||||
@ExcelProperty("预算年度") | |||||
private Integer projectYear; | |||||
@ExcelProperty("创建时间") | |||||
private String createOn; | |||||
@ExcelProperty("项目状态") | |||||
private String statusName; | |||||
} |
@@ -0,0 +1,42 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.model.dto; | |||||
import java.math.BigDecimal; | |||||
import com.alibaba.excel.annotation.ExcelProperty; | |||||
import lombok.AllArgsConstructor; | |||||
import lombok.Builder; | |||||
import lombok.Data; | |||||
import lombok.NoArgsConstructor; | |||||
/** | |||||
* 预审申报列表导出实体类 | |||||
* | |||||
* @author CMM | |||||
* @since 2023/03/10 10:20 | |||||
*/ | |||||
@Data | |||||
@Builder | |||||
@NoArgsConstructor | |||||
@AllArgsConstructor | |||||
public class PretrialDeclaredExportDTO { | |||||
@ExcelProperty(value = "序号",index = 0) | |||||
private Integer serialNumber; | |||||
@ExcelProperty("项目名称") | |||||
private String projectName; | |||||
@ExcelProperty("项目类型") | |||||
private String projectTypeName; | |||||
@ExcelProperty("申报金额(万元)") | |||||
private BigDecimal declareAmount; | |||||
@ExcelProperty("预算年度") | |||||
private Integer projectYear; | |||||
@ExcelProperty("创建时间") | |||||
private String createOn; | |||||
} |
@@ -0,0 +1,46 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.model.dto; | |||||
import java.math.BigDecimal; | |||||
import com.alibaba.excel.annotation.ExcelProperty; | |||||
import lombok.AllArgsConstructor; | |||||
import lombok.Builder; | |||||
import lombok.Data; | |||||
import lombok.NoArgsConstructor; | |||||
/** | |||||
* 项目内容调整列表导出实体类 | |||||
* | |||||
* @author CMM | |||||
* @since 2023/03/10 10:20 | |||||
*/ | |||||
@Data | |||||
@Builder | |||||
@NoArgsConstructor | |||||
@AllArgsConstructor | |||||
public class ProjectAdjustmentExportDTO { | |||||
@ExcelProperty(value = "序号",index = 0) | |||||
private Integer serialNumber; | |||||
@ExcelProperty("项目名称") | |||||
private String projectName; | |||||
@ExcelProperty("项目类型") | |||||
private String projectTypeName; | |||||
@ExcelProperty("申报金额(万元)") | |||||
private BigDecimal declareAmount; | |||||
@ExcelProperty("预算年度") | |||||
private Integer projectYear; | |||||
@ExcelProperty("项目状态") | |||||
private String statusName; | |||||
@ExcelProperty("创建时间") | |||||
private String createOn; | |||||
} |
@@ -0,0 +1,42 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.model.dto; | |||||
import java.io.Serializable; | |||||
import java.math.BigDecimal; | |||||
import com.alibaba.excel.annotation.ExcelProperty; | |||||
import lombok.Data; | |||||
/** | |||||
* 项目续建申报列表导出实体 | |||||
* | |||||
* @author CMM | |||||
* @since 2023/02/21 15:03 | |||||
*/ | |||||
@Data | |||||
public class ProjectRenewalDeclareExportDTO implements Serializable { | |||||
private static final long serialVersionUID = 1L; | |||||
@ExcelProperty(value = "序号",index = 0) | |||||
private Integer serialNumber; | |||||
@ExcelProperty("项目名称") | |||||
private String projectName; | |||||
@ExcelProperty("项目类型") | |||||
private String projectTypeName; | |||||
@ExcelProperty("预算年度") | |||||
private Integer projectYear; | |||||
@ExcelProperty("年度支付金额(万元)") | |||||
private BigDecimal annualPaymentAmount; | |||||
@ExcelProperty("状态") | |||||
private String approvalStatusName; | |||||
@ExcelProperty("创建时间") | |||||
private String createOn; | |||||
} |
@@ -62,9 +62,15 @@ public class ProjectRenewalFundDeclarationController { | |||||
} | } | ||||
@GetMapping("/export") | @GetMapping("/export") | ||||
@ApiOperation("续建项目列表导出") | |||||
@ApiOperation("项目库续建项目列表导出") | |||||
private void exportList(ProjectRenewalListReq req, HttpServletResponse response){ | private void exportList(ProjectRenewalListReq req, HttpServletResponse response){ | ||||
ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportList); | ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportList); | ||||
} | } | ||||
@GetMapping("/exportRenewalDeclare") | |||||
@ApiOperation("申报管理续建项目资金申报列表导出") | |||||
private void exportRenewalDeclareList(ProjectRenewalListReq req, HttpServletResponse response){ | |||||
ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportRenewalDeclareList); | |||||
} | |||||
} | } |
@@ -14,7 +14,6 @@ import com.ningdatech.basic.util.CollUtils; | |||||
import com.ningdatech.basic.util.ValidUtil; | import com.ningdatech.basic.util.ValidUtil; | ||||
import com.ningdatech.pmapi.common.constant.CommonConst; | import com.ningdatech.pmapi.common.constant.CommonConst; | ||||
import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter; | import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter; | ||||
import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent; | |||||
import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | import com.ningdatech.pmapi.common.util.ExcelDownUtil; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
@@ -82,7 +81,7 @@ public class AnnualPlanLibManage { | |||||
public PageVo<AnnualPlanListItemVO> annulPlanLibList(ProjectListReq req) { | public PageVo<AnnualPlanListItemVO> annulPlanLibList(ProjectListReq req) { | ||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | ||||
Integer isTemporaryAugment = req.getIsTemporaryAugment(); | Integer isTemporaryAugment = req.getIsTemporaryAugment(); | ||||
if (Objects.isNull(isTemporaryAugment)){ | |||||
if (Objects.isNull(isTemporaryAugment)) { | |||||
throw new BizException("请传入是否临时增补标志!"); | throw new BizException("请传入是否临时增补标志!"); | ||||
} | } | ||||
query.eq(Project::getIsTemporaryAugment, isTemporaryAugment); | query.eq(Project::getIsTemporaryAugment, isTemporaryAugment); | ||||
@@ -140,6 +139,8 @@ public class AnnualPlanLibManage { | |||||
.set(Project::getBuildCycle, req.getBuildCycle()) | .set(Project::getBuildCycle, req.getBuildCycle()) | ||||
.set(Project::getConstructionPlanFile, req.getBuildPlanFileId()) | .set(Project::getConstructionPlanFile, req.getBuildPlanFileId()) | ||||
.set(Project::getApprovalDate, req.getApprovedDate()) | .set(Project::getApprovalDate, req.getApprovedDate()) | ||||
.set(Project::getStatus, project.getStatus()) | |||||
.set(Project::getStage, project.getStage()) | |||||
.eq(Project::getId, req.getProjectId()); | .eq(Project::getId, req.getProjectId()); | ||||
projectService.update(update); | projectService.update(update); | ||||
} | } | ||||
@@ -222,7 +223,7 @@ public class AnnualPlanLibManage { | |||||
param.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | param.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | ||||
param.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | param.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | ||||
Integer isTemporaryAugment = param.getIsTemporaryAugment(); | Integer isTemporaryAugment = param.getIsTemporaryAugment(); | ||||
if (Objects.isNull(isTemporaryAugment)){ | |||||
if (Objects.isNull(isTemporaryAugment)) { | |||||
throw new BizException("请传入是否临时增补标志!"); | throw new BizException("请传入是否临时增补标志!"); | ||||
} | } | ||||
param.setIsTemporaryAugment(isTemporaryAugment); | param.setIsTemporaryAugment(isTemporaryAugment); | ||||
@@ -234,11 +235,11 @@ public class AnnualPlanLibManage { | |||||
ExcelExportWriter excelExportWriter = new ExcelExportWriter(); | ExcelExportWriter excelExportWriter = new ExcelExportWriter(); | ||||
Integer tableFlag = param.getTableFlag(); | Integer tableFlag = param.getTableFlag(); | ||||
if (Objects.isNull(tableFlag)){ | |||||
if (Objects.isNull(tableFlag)) { | |||||
throw new BizException("请传入要导出的表格类型!"); | throw new BizException("请传入要导出的表格类型!"); | ||||
} | } | ||||
String fileName = null; | String fileName = null; | ||||
if (tableFlag == 0){ | |||||
if (tableFlag == 0) { | |||||
fileName = "年度计划库编辑表"; | fileName = "年度计划库编辑表"; | ||||
} else if (tableFlag == 1) { | } else if (tableFlag == 1) { | ||||
fileName = "年度计划库列表"; | fileName = "年度计划库列表"; | ||||
@@ -11,6 +11,7 @@ import com.ningdatech.basic.util.NdDateUtils; | |||||
import com.ningdatech.pmapi.common.constant.CommonConst; | import com.ningdatech.pmapi.common.constant.CommonConst; | ||||
import com.ningdatech.pmapi.common.util.ExcelDownUtil; | import com.ningdatech.pmapi.common.util.ExcelDownUtil; | ||||
import com.ningdatech.pmapi.common.util.ExcelExportStyle; | import com.ningdatech.pmapi.common.util.ExcelExportStyle; | ||||
import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectRenewalDeclareExportDTO; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | ||||
@@ -189,6 +190,10 @@ public class ProjectRenewalFundManage { | |||||
return exportDTO; | return exportDTO; | ||||
}).collect(Collectors.toList()); | }).collect(Collectors.toList()); | ||||
for (int i = 0; i < collect.size(); i++) { | |||||
collect.get(i).setSerialNumber(i + 1); | |||||
} | |||||
String fileName = "续建项目资金库列表"; | String fileName = "续建项目资金库列表"; | ||||
ExcelDownUtil.setFileName(fileName,response); | ExcelDownUtil.setFileName(fileName,response); | ||||
@@ -203,4 +208,45 @@ public class ProjectRenewalFundManage { | |||||
throw new RuntimeException(e); | throw new RuntimeException(e); | ||||
} | } | ||||
} | } | ||||
public void exportRenewalDeclareList(HttpServletResponse response, ProjectRenewalListReq param) { | |||||
param.setPageNumber(CommonConst.EXPORT_PAGE_NUMBER); | |||||
param.setPageSize(CommonConst.EXPORT_PAGE_SIZE); | |||||
Page<ProjectRenewalFundDeclarationPO> page = param.page(); | |||||
projectRenewalFundDeclarationService.pageSql(page, param); | |||||
List<ProjectRenewalFundDeclarationPO> records = page.getRecords(); | |||||
List<ProjectRenewalDeclareExportDTO> collect = records.stream().map(r -> { | |||||
ProjectRenewalDeclareExportDTO exportDTO = new ProjectRenewalDeclareExportDTO(); | |||||
BeanUtils.copyProperties(r, exportDTO); | |||||
exportDTO.setProjectTypeName(ProjectTypeEnum.getDesc(r.getProjectType())); | |||||
if (ProjectRenewalApprovalStatusEnum.PENDING.name().equals(r.getApprovalStatus())) { | |||||
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PENDING.getDesc()); | |||||
} else if (ProjectRenewalApprovalStatusEnum.PASS.name().equals(r.getApprovalStatus())) { | |||||
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.PASS.getDesc()); | |||||
} else if (ProjectRenewalApprovalStatusEnum.NOT_PASS.name().equals(r.getApprovalStatus())) { | |||||
exportDTO.setApprovalStatusName(ProjectRenewalApprovalStatusEnum.NOT_PASS.getDesc()); | |||||
} | |||||
String createOnStr = NdDateUtils.format(r.getCreateOn(), "yyyy-MM-dd HH:mm"); | |||||
exportDTO.setCreateOn(createOnStr); | |||||
return exportDTO; | |||||
}).collect(Collectors.toList()); | |||||
for (int i = 0; i < collect.size(); i++) { | |||||
collect.get(i).setSerialNumber(i + 1); | |||||
} | |||||
String fileName = "续建项目资金申报列表"; | |||||
ExcelDownUtil.setFileName(fileName,response); | |||||
//数据导出处理函数 | |||||
try { | |||||
EasyExcel.write(response.getOutputStream(), ProjectRenewalDeclareExportDTO.class) | |||||
.autoCloseStream(false) | |||||
.registerWriteHandler(ExcelExportStyle.formalStyle()) | |||||
.sheet(fileName) | |||||
.doWrite(collect); | |||||
} catch (IOException e) { | |||||
throw new RuntimeException(e); | |||||
} | |||||
} | |||||
} | } |
@@ -17,6 +17,9 @@ public class ProjectRenewalExportDTO implements Serializable { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@ExcelProperty(value = "序号",index = 0) | |||||
private Integer serialNumber; | |||||
@ExcelProperty("项目名称") | @ExcelProperty("项目名称") | ||||
private String projectName; | private String projectName; | ||||
@@ -1,5 +1,7 @@ | |||||
package com.ningdatech.pmapi.projectlib.model.entity; | package com.ningdatech.pmapi.projectlib.model.entity; | ||||
import com.baomidou.mybatisplus.annotation.IdType; | |||||
import com.baomidou.mybatisplus.annotation.TableId; | |||||
import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
@@ -29,6 +31,7 @@ public class ProjectStatusChange implements Serializable { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@ApiModelProperty("主键") | @ApiModelProperty("主键") | ||||
@TableId(type = IdType.AUTO) | |||||
private Long id; | private Long id; | ||||
@ApiModelProperty("项目ID") | @ApiModelProperty("项目ID") | ||||
@@ -268,7 +268,7 @@ public class TodoCenterManage { | |||||
} | } | ||||
// 如果流程状态是被退回状态,流程通过后,进入下一个审核人, | // 如果流程状态是被退回状态,流程通过后,进入下一个审核人, | ||||
// 当前通过审核人一定不是最后一个审核人(下一个审核人至多是最后一个),更新流程状态为审核中 | |||||
// 当前通过审核人一定不是最后一个审核人(下一个审核人至多是最后一个) | |||||
if (ProcessStatusEnum.BE_BACKED.getDesc().equals(currentProcessStatus)) { | if (ProcessStatusEnum.BE_BACKED.getDesc().equals(currentProcessStatus)) { | ||||
// 获取发送浙政钉工作通知必要信息 | // 获取发送浙政钉工作通知必要信息 | ||||
WorkNoticeInfo passWorkNoticeInfo = getSendWorkNoticeInfo(auditUserInfo); | WorkNoticeInfo passWorkNoticeInfo = getSendWorkNoticeInfo(auditUserInfo); | ||||
@@ -69,12 +69,6 @@ | |||||
<artifactId>druid</artifactId> | <artifactId>druid</artifactId> | ||||
<version>${com.alibaba.druid.version}</version> | <version>${com.alibaba.druid.version}</version> | ||||
</dependency> | </dependency> | ||||
<!-- jwt --> | |||||
<dependency> | |||||
<groupId>com.auth0</groupId> | |||||
<artifactId>java-jwt</artifactId> | |||||
<version>${jwt.version}</version> | |||||
</dependency> | |||||
<!-- mybatis plus --> | <!-- mybatis plus --> | ||||
<dependency> | <dependency> | ||||
<groupId>com.baomidou</groupId> | <groupId>com.baomidou</groupId> | ||||