Skip to content

Y
yn-health-science
Commit ee25ce52 authored by wangxl's avatar wangxl
Browse files
Options

1

parent 20756404
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 229 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java
View file @ ee25ce52
...@@ -29,19 +29,9 @@ public class ComProjectTask extends BaseEntity { ...@@ -29,19 +29,9 @@ public class ComProjectTask extends BaseEntity {
/** 年度 */ /** 年度 */
@ApiModelProperty(value = "年度", position = 2 ) @ApiModelProperty(value = "年度", position = 2 )
private Integer reportYear; private Integer reportYear;
/** 任务书状态 0 未 填,-20 起 草, -10 待提交,1 审核中,10 审核通过,20 审核不通过,30 返回修改 */ /** 合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过*/
@ApiModelProperty(value = "任务书状态 0 未 填,-20 起 草, -10 待提交,1 审核中,10 审核通过,20 审核不通过,30 返回修改", position = 3 ) @ApiModelProperty(value = "合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过", position = 3 )
private Integer testState; private Integer taskState;
/** 实施目标和主要内容 */
@ApiModelProperty(value = "实施目标和主要内容", position = 4 )
@Length(max=1000, message = "实施目标和主要内容不能大于1000")
private String testContent;
/** 总经费 */
@ApiModelProperty(value = "总经费", position = 5 )
private BigDecimal budgetCount;
/** 市卫计委资助 */
@ApiModelProperty(value = "市卫计委资助", position = 6 )
private BigDecimal budgetGovCount;
/** 开始日期 */ /** 开始日期 */
@ApiModelProperty(value = "开始日期", position = 7 ) @ApiModelProperty(value = "开始日期", position = 7 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
...@@ -50,6 +40,11 @@ public class ComProjectTask extends BaseEntity { ...@@ -50,6 +40,11 @@ public class ComProjectTask extends BaseEntity {
@ApiModelProperty(value = "结束日期", position = 8 ) @ApiModelProperty(value = "结束日期", position = 8 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate; private Date endDate;
/** 项目类型 */
@ApiModelProperty(value = "项目类型", position = 3 )
private Integer projType;
/** 组织机构代码/统一社会信用代码 */ /** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 ) @ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50") @Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
...@@ -122,8 +117,6 @@ public class ComProjectTask extends BaseEntity { ...@@ -122,8 +117,6 @@ public class ComProjectTask extends BaseEntity {
@Length(max=100, message = "项目依托的科技创新基地不能大于100") @Length(max=100, message = "项目依托的科技创新基地不能大于100")
private String technologyInnovationBase; private String technologyInnovationBase;
/** 项目联系人姓名 */ /** 项目联系人姓名 */
@ApiModelProperty(value = "项目联系人姓名", position = 16) @ApiModelProperty(value = "项目联系人姓名", position = 16)
@Length(max=100, message = "项目联系人姓名不能大于100") @Length(max=100, message = "项目联系人姓名不能大于100")
......
science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java
View file @ ee25ce52
...@@ -419,12 +419,12 @@ public class CommonEnum { ...@@ -419,12 +419,12 @@ public class CommonEnum {
*/ */
public enum taskState implements INumberEnum { public enum taskState implements INumberEnum {
noWrite(0, "未填"), noWrite(0, "未填"),
draft(-20, "起草"), draft(-10, "起草"),
waitSubmit(-10, "待提交"), waitSubmit(10, "待提交"),
review(1, "审核中"), review(20, "审核中"),
returnModify(30, "返回修改"), returnModify(30, "返回修改"),
failed(20, "审核不通过"), failed(40, "审核不通过"),
pass(10, "审核通过"); pass(50, "审核通过");
taskState(int number, String description) { taskState(int number, String description) {
this.code = number; this.code = number;
...@@ -635,6 +635,10 @@ public class CommonEnum { ...@@ -635,6 +635,10 @@ public class CommonEnum {
projectAssign("projectAssign", "项目分配"), projectAssign("projectAssign", "项目分配"),
assignDelete("assignDelete", "删除评分记录"), assignDelete("assignDelete", "删除评分记录"),
taskBookSave("taskBookSave", "合同书保存"),
taskBookReport("taskBookReport", "合同书上报"),
taskBookAudit("taskBookAudit", "合同书审核"),
conclusionSave("conclusionSave", "结题信息保存"), conclusionSave("conclusionSave", "结题信息保存"),
conclusionReport("conclusionReport", "结题上报"), conclusionReport("conclusionReport", "结题上报"),
conclusionAudit("conclusionAudit", "结题审核"), conclusionAudit("conclusionAudit", "结题审核"),
...@@ -647,8 +651,6 @@ public class CommonEnum { ...@@ -647,8 +651,6 @@ public class CommonEnum {
batchUpdate("batchUpdate", "批次删除"), batchUpdate("batchUpdate", "批次删除"),
batchDelete("batchDelete", "批次修改"), batchDelete("batchDelete", "批次修改"),
taskBookReport("taskBookReport", "任务书上报"),
taskBookAudit("taskBookAudit", "任务书审核"),
checkReport("checkReport", "中期考核上报"), checkReport("checkReport", "中期考核上报"),
checkAudit("checkAudit", "中期考核表审核"), checkAudit("checkAudit", "中期考核表审核"),
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectTaskDTO.java
View file @ ee25ce52
...@@ -29,19 +29,9 @@ public class ComProjectTaskDTO extends BaseDTO { ...@@ -29,19 +29,9 @@ public class ComProjectTaskDTO extends BaseDTO {
/** 年度 */ /** 年度 */
@ApiModelProperty(value = "年度", position = 2 ) @ApiModelProperty(value = "年度", position = 2 )
private Integer reportYear; private Integer reportYear;
/** 任务书状态 0 未 填,-20 起 草, -10 待提交,1 审核中,10 审核通过,20 审核不通过,30 返回修改 */ /** 合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过*/
@ApiModelProperty(value = "任务书状态 0 未 填,-20 起 草, -10 待提交,1 审核中,10 审核通过,20 审核不通过,30 返回修改", position = 3 ) @ApiModelProperty(value = "合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过", position = 3 )
private Integer testState; private Integer taskState;
/** 实施目标和主要内容 */
@ApiModelProperty(value = "实施目标和主要内容", position = 4 )
@Length(max=1000, message = "实施目标和主要内容不能大于1000")
private String testContent;
/** 总经费 */
@ApiModelProperty(value = "总经费", position = 5 )
private BigDecimal budgetCount;
/** 市卫计委资助 */
@ApiModelProperty(value = "市卫计委资助", position = 6 )
private BigDecimal budgetGovCount;
/** 开始日期 */ /** 开始日期 */
@ApiModelProperty(value = "开始日期", position = 7 ) @ApiModelProperty(value = "开始日期", position = 7 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
...@@ -51,15 +41,15 @@ public class ComProjectTaskDTO extends BaseDTO { ...@@ -51,15 +41,15 @@ public class ComProjectTaskDTO extends BaseDTO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate; private Date endDate;
/** 项目编号 */
@ApiModelProperty(value = "项目编号", position = 2 )
private String projNo;
/** 项目名称 */ /** 项目名称 */
@ApiModelProperty(value = "项目名称", position = 1 ) @ApiModelProperty(value = "项目名称", position = 1 )
private String projName; private String projName;
/** 单位名称 */ /** 项目编号 */
@ApiModelProperty(value = "单位名称", position = 41) @ApiModelProperty(value = "项目编号", position = 2 )
private String appUnitName; private String projNo;
/** 项目类型 */
@ApiModelProperty(value = "项目类型", position = 3 )
private Integer projType;
/** 项目开始时间 */ /** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 ) @ApiModelProperty(value = "项目开始时间", position = 10 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
...@@ -68,21 +58,20 @@ public class ComProjectTaskDTO extends BaseDTO { ...@@ -68,21 +58,20 @@ public class ComProjectTaskDTO extends BaseDTO {
@ApiModelProperty(value = "项目结束时间", position = 11 ) @ApiModelProperty(value = "项目结束时间", position = 11 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date projEnd; private Date projEnd;
/** 邮箱 */ /** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
@ApiModelProperty(value = "邮箱", position = 41) @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7 )
private String linkEmail; private Integer projState;
/** 联系电话 */
@ApiModelProperty(value = "联系电话", position = 41) /** 单位id */
private String linkTel; @ApiModelProperty(value = "单位id", position = 41)
/** 联系地址 */ private String appUnitId;
@ApiModelProperty(value = "联系地址", position = 41) /** 单位名称 */
private String linkAddress; @ApiModelProperty(value = "单位名称", position = 41)
/** 邮编 */ private String appUnitName;
@ApiModelProperty(value = "邮编", position = 41)
private String postcode; /** 人员Id */
/** 主管部门 */ @ApiModelProperty(value = "人员Id", position = 41)
@ApiModelProperty(value = "主管部门", position = 41) private String appPersonId;
private String authority;
/** 姓名 */ /** 姓名 */
@ApiModelProperty(value = "姓名", position = 41) @ApiModelProperty(value = "姓名", position = 41)
private String appPersonName; private String appPersonName;
...@@ -101,91 +90,4 @@ public class ComProjectTaskDTO extends BaseDTO { ...@@ -101,91 +90,4 @@ public class ComProjectTaskDTO extends BaseDTO {
/** 职称 */ /** 职称 */
@ApiModelProperty(value = "职称", position = 3) @ApiModelProperty(value = "职称", position = 3)
private String titleName; private String titleName;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 经费表 */
private List<ComProjectBudgetDTO> budget;
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> together;
/** 预期成果 */
private List<ComTaskTargetDTO> target;
/** 审核列表 */
private List<ComProjectAuditNoteDTO> auditList;
/** 项目要实现的目标 */
private List<ComProjectStageGoalDTO> cont1;
/** 主要研发内容 */
private List<ComProjectStageGoalDTO> cont2;
/** 主要技术及学术指标 */
private List<ComProjectStageGoalDTO> cont3;
/** 人才培养 */
private List<ComProjectStageGoalDTO> cont4;
/** 其他应考核的指标 */
private List<ComProjectStageGoalDTO> cont5;
/** 项目阶段实施内容及目标 */
private List<ComProjectStageGoalDTO> cont6;
/** 内容总和 */
private List<ComProjectStageGoalDTO> content;
/** 项目组成员_总人数 */
@ApiModelProperty(value = "项目组成员_总人数", position = 17 )
private Integer memCount;
/** 项目组成员_高职 */
@ApiModelProperty(value = "项目组成员_高职", position = 18 )
private Integer memHighCount;
/** 项目组成员_中职 */
@ApiModelProperty(value = "项目组成员_中职", position = 19 )
private Integer memMiddleCount;
/** 项目组成员_初职 */
@ApiModelProperty(value = "项目组成员_初职", position = 20 )
private Integer memLowCount;
/** 项目组成员_其他 */
@ApiModelProperty(value = "项目组成员_其他", position = 21 )
private Integer memOtherCount;
/** 项目组成员_博士研究生 */
@ApiModelProperty(value = "项目组成员_博士研究生", position = 22 )
private Integer memBsCount;
/** 项目组成员_硕士研究生 */
@ApiModelProperty(value = "项目组成员_硕士研究生", position = 23 )
private Integer memSsCount;
/** 项目组成员_博士(学历) */
@ApiModelProperty(value = "项目组成员_博士(学历)", position = 24 )
private Integer memDegree1;
/** 项目组成员_硕士(学历) */
@ApiModelProperty(value = "项目组成员_硕士(学历)", position = 25 )
private Integer memDegree2;
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
/** 项目主要参与单位 */
private List<ComProjectCooperativeUnitsDTO> participateUnits;
// /** 项目组成员 */
// private List<ComProjectMembersDTO> members;
// /** 经费表 */
// private List<ComProjectBudgetDTO> budget;
/** 年度用款计划 */
private List<ComProjectFundPlanDTO> fundPlan;
/** 设备仪器经费表 */
private List<ComProjectEquipmentDTO> equipments;
/** 单位支出明细预算 */
private List<ComProjectUnitPaymentDTO> unitPayment;
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 在研或完成基础研究项目情况 */
private List<ComProjectResearchDTO> projectResearchList;
/** 项目课颖设置表 */
private List<ComProjectSubDTO> projectSubList;
/** 单位科研项目及资金管理制度表 */
private List<ComProjectManagementRuleDTO> managementRuleList;
/** 附件列表 */
private List<ComFileDTO> fileList;
// /** 审核列表 */
// private List<ComProjectAuditNoteDTO> auditList;
/** 项目安排及阶段目标 */
private List<ComProjectStageGoalDTO> stageGoals;
/** 成果形式 */
// private List<ComProjectResultsDTO> results;
private List<String> results;
} }
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectTaskQueryVO.java
View file @ ee25ce52
...@@ -22,83 +22,56 @@ import java.util.Date; ...@@ -22,83 +22,56 @@ import java.util.Date;
@ApiModel(description = "查询任务书表VO") @ApiModel(description = "查询任务书表VO")
public class ComProjectTaskQueryVO extends PaginationVO{ public class ComProjectTaskQueryVO extends PaginationVO{
/** 项目Id */ /** 项目Id */
@ApiModelProperty(value = "项目Id", position = 1) @ApiModelProperty(value = "项目Id", position = 1 )
@Length(max=36, message = "项目Id不能大于36")
private String projId; private String projId;
/** 年度 */ /** 年度 */
@ApiModelProperty(value = "年度", position = 2) @ApiModelProperty(value = "年度", position = 2 )
private Integer reportYear; private Integer reportYear;
/** 任务书状态 0 未 填,-20 起 草, -10 待提交,1 审核中,10 审核通过,20 审核不通过,30 返回修改 */ /** 合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过*/
@ApiModelProperty(value = "任务书状态 0 未 填,-20 起 草, -10 待提交,1 审核中,10 审核通过,20 审核不通过,30 返回修改", position = 3) @ApiModelProperty(value = "合同书状态 0 未 填,-10 起 草, 10 待提交,20 审核中,30 返回修改，40 审核不通过， 50 审核通过", position = 3 )
private Integer testState; private Integer taskState;
/** 实施目标和主要内容 */
@ApiModelProperty(value = "实施目标和主要内容", position = 4)
private String testContent;
/** 总经费 */
@ApiModelProperty(value = "总经费", position = 5)
private BigDecimal budgetCount;
/** 市卫计委资助 */
@ApiModelProperty(value = "市卫计委资助", position = 6)
private BigDecimal budgetGovCount;
/** 开始日期 */ /** 开始日期 */
@ApiModelProperty(value = "开始日期", position = 7) @ApiModelProperty(value = "开始日期", position = 7 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date startDate; private Date startDate;
/** 结束日期 */ /** 结束日期 */
@ApiModelProperty(value = "结束日期", position = 8) @ApiModelProperty(value = "结束日期", position = 8 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate; private Date endDate;
/** 项目名称 */ /** 项目名称 */
@ApiModelProperty(value = "项目名称", position = 1) @ApiModelProperty(value = "项目名称", position = 1 )
private String projName; private String projName;
/** 项目编号 */ /** 项目编号 */
@ApiModelProperty(value = "项目编号", position = 2) @ApiModelProperty(value = "项目编号", position = 2 )
private String projNo; private String projNo;
/** 项目开始日期 */ /** 项目类型 */
@ApiModelProperty(value = "开始日期", position = 7) @ApiModelProperty(value = "项目类型", position = 3 )
private Integer projType;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date projStart; private Date projStart;
/** 项目结束日期 */ /** 项目结束时间 */
@ApiModelProperty(value = "结束日期", position = 8) @ApiModelProperty(value = "项目结束时间", position = 11 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date projEnd; private Date projEnd;
/** 项目类别 */ /** 项目状态 -10 起草,10 待提交, 20 审核中,30 返回修改,40 未批准立项,50 批准立项 */
@ApiModelProperty(value = "项目类别", position = 3) @ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 审核中,30 返回修改,40 未批准立项,50 批准立项", position = 7 )
private String projClass;
/** 申请编号 */
@ApiModelProperty(value = "申请编号", position = 4)
private String appNo;
/** 版本号 */
@ApiModelProperty(value = "版本号", position = 5)
private String versionNo;
/** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
@ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7)
private Integer projState; private Integer projState;
/** 单位id */
@ApiModelProperty(value = "单位id", position = 41)
private String appUnitId;
/** 单位名称 */ /** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 41) @ApiModelProperty(value = "单位名称", position = 41)
private String appUnitName; private String appUnitName;
/** 树编码 */
@ApiModelProperty(value = "树编码", position = 1) /** 人员Id */
private String treeCode; @ApiModelProperty(value = "人员Id", position = 41)
private String appPersonId;
/** 姓名 */ /** 姓名 */
@ApiModelProperty(value = "姓名", position = 41) @ApiModelProperty(value = "姓名", position = 41)
private String appPersonName; private String appPersonName;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3)
private String projClassName;
/** 项目状态 */
@ApiModelProperty(value = "项目状态", position = 41)
private String projStateName;
/** 任务书状态 */
@ApiModelProperty(value = "任务书状态", position = 41)
private String testStateName;
/** 申报单位Id */
@ApiModelProperty(value = "申报单位Id", position = 8 )
@Length(max=36, message = "申报单位Id不能大于36")
private String appUnitId;
/** 申报人Id */
@ApiModelProperty(value = "申报人Id", position = 9 )
@Length(max=36, message = "申报人Id不能大于36")
private String appPersonId;
} }
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java
View file @ ee25ce52
...@@ -16,6 +16,7 @@ import com.yiboshi.science.param.query.ComProjectTaskQueryVO; ...@@ -16,6 +16,7 @@ import com.yiboshi.science.param.query.ComProjectTaskQueryVO;
import com.yiboshi.science.rest.BaseController; import com.yiboshi.science.rest.BaseController;
import com.yiboshi.science.service.ComProjectTaskService; import com.yiboshi.science.service.ComProjectTaskService;
import com.yiboshi.science.service.SystemParameterService; import com.yiboshi.science.service.SystemParameterService;
import com.yiboshi.science.utils.StringUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -36,15 +37,12 @@ import java.util.List; ...@@ -36,15 +37,12 @@ import java.util.List;
*/ */
@Api(tags = "com-project-test", description = "任务书表") @Api(tags = "com-project-test", description = "任务书表")
@RestController @RestController
@RequestMapping("/v1/science-admin/com-project-test") @RequestMapping("/v1/science-admin/com-project-task")
public class ComProjectTaskController extends BaseController<ComProjectTaskService, ComProjectTaskQueryVO, ComProjectTaskDTO, ComProjectTask> { public class ComProjectTaskController extends BaseController<ComProjectTaskService, ComProjectTaskQueryVO, ComProjectTaskDTO, ComProjectTask> {
@Autowired @Autowired
private ComProjectTaskService ComProjectTaskService; private ComProjectTaskService ComProjectTaskService;
@Autowired
private SystemParameterService systemParameterService;
/** /**
* 功能:分页查询 * 功能:分页查询
* *
...@@ -54,12 +52,16 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi ...@@ -54,12 +52,16 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
@GetMapping @GetMapping
@RequestMapping("/getListByPage") @RequestMapping("/getListByPage")
public ResponseDataModel<Pagination<ComProjectTaskDTO>> getListByPage(@Validated ComProjectTaskQueryVO vo, BindingResult bindingResult) { public ResponseDataModel<Pagination<ComProjectTaskDTO>> getListByPage(@Validated ComProjectTaskQueryVO vo, BindingResult bindingResult) {
vo.setAppPersonId(SecurityUserHolder.getPersonId()); if (!StringUtil.isContainsRole(SecurityUserHolder.getRoles(), CommonEnum.systemRole.sys.getCode().toString())) {
vo.setAppPersonId(SecurityUserHolder.getPersonId());
}
vo.setProjState(CommonEnum.projState.pass.getCode()); vo.setProjState(CommonEnum.projState.pass.getCode());
Pagination<ComProjectTaskDTO> page = ComProjectTaskService.getListByPage(vo); Pagination<ComProjectTaskDTO> page = ComProjectTaskService.getListByPage(vo);
page.getDataList().forEach((e) -> { if (null != page && null != page.getDataList() && page.getDataList().size() != 0) {
page.getDataList().forEach((e) -> {
}); });
}
return ResponseDataModel.ok(page); return ResponseDataModel.ok(page);
} }
...@@ -85,7 +87,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi ...@@ -85,7 +87,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
@ApiOperation(value = "保存任务书信息", httpMethod = "POST", notes = "保存任务书信息") @ApiOperation(value = "保存任务书信息", httpMethod = "POST", notes = "保存任务书信息")
@PostMapping @PostMapping
@RequestMapping("/save") @RequestMapping("/save")
//@SystemLogs(value = CommonEnum.LogType.TaskBookSave) @Logs(value = CommonEnum.logType.taskBookSave)
public ResponseDataModel<String> save(@RequestBody ComProjectTaskDTO dto) { public ResponseDataModel<String> save(@RequestBody ComProjectTaskDTO dto) {
return ResponseDataModel.ok(ComProjectTaskService.save(dto)); return ResponseDataModel.ok(ComProjectTaskService.save(dto));
} }
...@@ -128,8 +130,8 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi ...@@ -128,8 +130,8 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
@ApiOperation(value = "获取任务书状态", httpMethod = "GET", notes = "获取任务书状态") @ApiOperation(value = "获取任务书状态", httpMethod = "GET", notes = "获取任务书状态")
@GetMapping @GetMapping
@RequestMapping("/getTestStateList") @RequestMapping("/getTaskStateList")
public ResponseDataModel<List<SelectListItem>> getTestStateList() { public ResponseDataModel<List<SelectListItem>> getTaskStateList() {
List<SelectListItem> list = new ArrayList<>(CommonEnum.taskState.values().length); List<SelectListItem> list = new ArrayList<>(CommonEnum.taskState.values().length);
for (CommonEnum.taskState type : CommonEnum.taskState.values()) { for (CommonEnum.taskState type : CommonEnum.taskState.values()) {
SelectListItem item = new SelectListItem(); SelectListItem item = new SelectListItem();
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
View file @ ee25ce52
...@@ -29,7 +29,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro ...@@ -29,7 +29,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
* *
* @return * @return
*/ */
void updateStateOrNo(String id, Integer state, String versionNo); void updateStateOrNo(String id, Integer state, String versionNo, String projNo);
/** /**
* 获取新的版本号 * 获取新的版本号
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComBatchServiceImpl.java
View file @ ee25ce52
...@@ -13,6 +13,7 @@ import com.yiboshi.science.enumeration.CommonEnum; ...@@ -13,6 +13,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.ComBatchDTO; import com.yiboshi.science.param.dto.ComBatchDTO;
import com.yiboshi.science.param.query.ComBatchQueryVO; import com.yiboshi.science.param.query.ComBatchQueryVO;
import com.yiboshi.science.service.ComBatchService; import com.yiboshi.science.service.ComBatchService;
import com.yiboshi.science.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -91,6 +92,8 @@ public class ComBatchServiceImpl extends BaseServiceImpl<ComBatchDAO, ComBatchQu ...@@ -91,6 +92,8 @@ public class ComBatchServiceImpl extends BaseServiceImpl<ComBatchDAO, ComBatchQu
ComBatch batch = new ComBatch(); ComBatch batch = new ComBatch();
batch.setYear(dto.getYear()); batch.setYear(dto.getYear());
batch.setBatch(dto.getBatch()); batch.setBatch(dto.getBatch());
batch.setProjType(dto.getProjType());
batch.setTimeType(dto.getTimeType());
batch = this.getEntity(batch); batch = this.getEntity(batch);
if (null != batch) if (null != batch)
throw new BusinessException("年度批次已存在！"); throw new BusinessException("年度批次已存在！");
...@@ -104,8 +107,10 @@ public class ComBatchServiceImpl extends BaseServiceImpl<ComBatchDAO, ComBatchQu ...@@ -104,8 +107,10 @@ public class ComBatchServiceImpl extends BaseServiceImpl<ComBatchDAO, ComBatchQu
throw new BusinessException("批次不存在或已删除！"); throw new BusinessException("批次不存在或已删除！");
if (!dto.getYear().equals(batch.getYear()) || !dto.getBatch().equals(batch.getBatch())) { if (!dto.getYear().equals(batch.getYear()) || !dto.getBatch().equals(batch.getBatch())) {
ComBatch comBatch = new ComBatch(); ComBatch comBatch = new ComBatch();
comBatch.setYear(dto.getYear()); batch.setYear(dto.getYear());
comBatch.setBatch(dto.getBatch()); batch.setBatch(dto.getBatch());
batch.setProjType(dto.getProjType());
batch.setTimeType(dto.getTimeType());
comBatch = this.getEntity(comBatch); comBatch = this.getEntity(comBatch);
if (null != comBatch) if (null != comBatch)
throw new BusinessException("年度批次已存在！"); throw new BusinessException("年度批次已存在！");
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java
View file @ ee25ce52
...@@ -193,7 +193,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC ...@@ -193,7 +193,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
modal.setId(conclusion.getId()); modal.setId(conclusion.getId());
modal.setState(CommonEnum.conclusionState.report.getCode()); modal.setState(CommonEnum.conclusionState.report.getCode());
modal.setThesisState(CommonEnum.thesisState.pass.getCode()); modal.setThesisState(CommonEnum.thesisState.pass.getCode());
comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null); comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null, null);
comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4, auditUnitId, treeCode); comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4, auditUnitId, treeCode);
return this.update(modal); return this.update(modal);
} }
...@@ -210,7 +210,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC ...@@ -210,7 +210,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
Integer state = null; Integer state = null;
if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) { if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
state = CommonEnum.conclusionState.pass.getCode(); state = CommonEnum.conclusionState.pass.getCode();
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null); comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null, null);
} else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) { } else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
state = CommonEnum.conclusionState.returnModify.getCode(); state = CommonEnum.conclusionState.returnModify.getCode();
} else { } else {
...@@ -236,7 +236,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC ...@@ -236,7 +236,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
Integer state = null; Integer state = null;
if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) { if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
state = CommonEnum.thesisState.pass.getCode(); state = CommonEnum.thesisState.pass.getCode();
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null); comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null, null);
} else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) { } else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
state = CommonEnum.thesisState.returnModify.getCode(); state = CommonEnum.thesisState.returnModify.getCode();
} else { } else {
...@@ -307,7 +307,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC ...@@ -307,7 +307,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
c.setThesisState(CommonEnum.thesisState.unFilled.getCode()); c.setThesisState(CommonEnum.thesisState.unFilled.getCode());
this.update(c); this.update(c);
} }
comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null); comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null, null);
comProjectAuditService.insertAudit(comProject.getReportYear(), 4, id, CommonEnum.auditMethod.audit.getCode(), comProjectAuditService.insertAudit(comProject.getReportYear(), 4, id, CommonEnum.auditMethod.audit.getCode(),
auditUnitId, null, CommonEnum.auditResult.pass.getCode(), new Date(), 1, 1, SecurityUserHolder.getPersonId()); auditUnitId, null, CommonEnum.auditResult.pass.getCode(), new Date(), 1, 1, SecurityUserHolder.getPersonId());
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ ee25ce52
...@@ -602,10 +602,11 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -602,10 +602,11 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
* *
* @return * @return
*/ */
public void updateStateOrNo(String id, Integer state, String versionNo) { public void updateStateOrNo(String id, Integer state, String versionNo, String projNo) {
ComProject comProject = new ComProject(); ComProject comProject = new ComProject();
comProject.setId(id); comProject.setId(id);
comProject.setProjState(state); comProject.setProjState(state);
comProject.setProjNo(projNo);
comProject.setVersionNo(versionNo); comProject.setVersionNo(versionNo);
this.update(comProject); this.update(comProject);
} }
...@@ -649,7 +650,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -649,7 +650,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
else else
versionNo = this.getVersionNo(comProject.getVersionNo()); versionNo = this.getVersionNo(comProject.getVersionNo());
// 更新项目状态 // 更新项目状态
this.updateStateOrNo(model.getAuditObjectId(), CommonEnum.projState.toAudit.getCode(), versionNo); this.updateStateOrNo(model.getAuditObjectId(), CommonEnum.projState.toAudit.getCode(), versionNo, null);
} }
@Transactional @Transactional
...@@ -692,9 +693,12 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -692,9 +693,12 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
String unitId = comProjectAuditService.audit(audit, appUnit.getTreeCode(), auditTreeCode); String unitId = comProjectAuditService.audit(audit, appUnit.getTreeCode(), auditTreeCode);
// 处理项目状态 // 处理项目状态
Integer projState = null; Integer projState = null;
String projNo = null;
if (audit.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) { if (audit.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
if (unitId == null) if (unitId == null) {
projState = CommonEnum.projState.pass.getCode(); projState = CommonEnum.projState.pass.getCode();
projNo = this.getProjectNo(model.getReportYear(), "YNLCYXZX");
}
} else if (audit.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) { } else if (audit.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
if (unitId == null) if (unitId == null)
projState = CommonEnum.projState.returnModify.getCode(); projState = CommonEnum.projState.returnModify.getCode();
...@@ -702,7 +706,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -702,7 +706,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
projState = CommonEnum.projState.failed.getCode(); projState = CommonEnum.projState.failed.getCode();
} }
if (null != projState) if (null != projState)
this.updateStateOrNo(audit.getAuditObjectId(), projState, null); this.updateStateOrNo(audit.getAuditObjectId(), projState, null, projNo);
} }
public DataStatisticsDTO getCount(ComProject e) { public DataStatisticsDTO getCount(ComProject e) {
...@@ -934,7 +938,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -934,7 +938,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
} }
private String InsertProjectBaseInfo(ComProjectDTO dto) { private String InsertProjectBaseInfo(ComProjectDTO dto) {
ComBatchDTO comBatchDTO = comBatchService.getCurrentBatch(dto.getProjType(),null); ComBatchDTO comBatchDTO = comBatchService.getCurrentBatch(dto.getProjType(), null);
ComProject comProject = convert2Entity(dto); ComProject comProject = convert2Entity(dto);
comProject.setAppNo(getAppNo()); comProject.setAppNo(getAppNo());
comProject.setReportYear(comBatchDTO.getYear()); comProject.setReportYear(comBatchDTO.getYear());
...@@ -967,7 +971,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -967,7 +971,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
@Transactional @Transactional
//插入 //插入
public String projectInsert(ComProjectDTO dto) { public String projectInsert(ComProjectDTO dto) {
ComBatchDTO comBatchDTO = comBatchService.getCurrentBatch(dto.getProjType(),null); ComBatchDTO comBatchDTO = comBatchService.getCurrentBatch(dto.getProjType(), null);
ComProject comProject = convert2Entity(dto); ComProject comProject = convert2Entity(dto);
comProject.setAppNo(getAppNo()); comProject.setAppNo(getAppNo());
comProject.setReportYear(comBatchDTO.getYear()); comProject.setReportYear(comBatchDTO.getYear());
......
science-admin/src/main/resources/mapper/ComProjectTaskDAO.xml
View file @ ee25ce52
...@@ -4,11 +4,15 @@ ...@@ -4,11 +4,15 @@
<!-- 任务书表 --> <!-- 任务书表 -->
<mapper namespace="com.yiboshi.science.dao.ComProjectTaskDAO"> <mapper namespace="com.yiboshi.science.dao.ComProjectTaskDAO">
<sql id="allColumns"> <sql id="allColumns">
t.id as id, t.proj_id as projId, t.report_year as reportYear, t.test_state as testState, t.test_content as testContent, t.budget_count as budgetCount, t.budget_gov_count as budgetGovCount, t.start_date as startDate, t
t.end_date as endDate, t.created as created, t.updated as updated .
id
as id, t.proj_id as projId, t.report_year as reportYear, t.task_state as taskState, t.end_date as endDate, t.created as created, t.updated as updated
</sql> </sql>
<select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectTaskDTO"> <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectTaskDTO">
select b.id,b.test_state,b.start_date,b.end_date,c.id as proj_id,c.proj_name,c.proj_no,c.version_no,c.proj_class,c.report_year,c.start_date proj_start,c.end_date proj_end,c.proj_state,d.unit_name app_unit_name,e.person_name app_person_name select b.id,ifnull(b.task_state,0) task_state,b.start_date,b.end_date,
c.id as proj_id,c.proj_name,c.proj_no,c.version_no,c.proj_class,c.report_year,c.start_date proj_start,c.end_date proj_end,
c.proj_state,d.unit_name app_unit_name,e.person_name app_person_name
from com_project c from com_project c
left join com_project_task b on b.proj_id=c.id left join com_project_task b on b.proj_id=c.id
left join com_unit d on c.app_unit_id=d.id left join com_unit d on c.app_unit_id=d.id
...@@ -18,10 +22,10 @@ ...@@ -18,10 +22,10 @@
</where> </where>
</select> </select>
<select id="getCount" resultType="com.yiboshi.science.param.dto.DataStatisticsDTO"> <select id="getCount" resultType="com.yiboshi.science.param.dto.DataStatisticsDTO">
SELECT ifnull(sum(case when c.proj_state=50 and (b.test_state &lt; 1 or b.id is null) then 1 else 0 end),0) count1, SELECT ifnull(sum(case when c.proj_state=50 and (b.task_state in(-10,10) or b.id is null) then 1 else 0 end),0)count1,
ifnull(sum(case when c.proj_state=50 and b.test_state =30 then 1 else 0 end),0) count2, ifnull(sum(case when c.proj_state=50 and b.task_state =30 then 1 else 0 end),0) count2,
ifnull(sum(case when c.proj_state=50 and b.test_state in(1,10,20) then 1 else 0 end),0) count3, ifnull(sum(case when c.proj_state=50 and b.task_state in(20,40,50) then 1 else 0 end),0) count3,
ifnull(sum(case when c.proj_state=50 then 1 else 0 end),0) count4 ifnull(count(*),0) count4
from com_project c from com_project c
left join com_project_task b on b.proj_id=c.id left join com_project_task b on b.proj_id=c.id
<where> <where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment