Browse Source

Merge remote-tracking branch 'origin/master'

tags/24080901
CMM 1 year ago
parent
commit
55c5a7ed90
32 changed files with 99 additions and 6 deletions
  1. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java
  2. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertMetaApplyController.java
  3. +4
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java
  4. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/DocumentationController.java
  5. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/ProjectFileController.java
  6. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java
  7. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/leave/controller/ExpertLeaveController.java
  8. +0
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/DashboardController.java
  9. +0
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java
  10. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java
  11. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java
  12. +1
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java
  13. +1
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java
  14. +6
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java
  15. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java
  16. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java
  17. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java
  18. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java
  19. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/FinalAcceptanceController.java
  20. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java
  21. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java
  22. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java
  23. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PurchaseController.java
  24. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
  25. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java
  26. +8
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java
  27. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/sms/controller/VerificationCodeController.java
  28. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java
  29. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NotifyController.java
  30. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java
  31. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java
  32. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java

+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java View File

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.expert.controller;




import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.expert.manage.ExpertAdminManage; import com.ningdatech.pmapi.expert.manage.ExpertAdminManage;
import com.ningdatech.pmapi.expert.manage.ExpertManage; import com.ningdatech.pmapi.expert.manage.ExpertManage;
import com.ningdatech.pmapi.expert.model.ExpertAdminExpertManageQuery; import com.ningdatech.pmapi.expert.model.ExpertAdminExpertManageQuery;
@@ -40,12 +41,14 @@ public class ExpertController {


@PostMapping("/registration") @PostMapping("/registration")
@ApiOperation("社会专家报名") @ApiOperation("社会专家报名")
@WebLog("社会专家报名")
public void expertRegistration(@Valid @RequestBody ExpertRegistrationRequest request) { public void expertRegistration(@Valid @RequestBody ExpertRegistrationRequest request) {
expertManage.expertRegistration(request); expertManage.expertRegistration(request);
} }


@PostMapping("/basic-info-submit") @PostMapping("/basic-info-submit")
@ApiOperation("专家管理员新增专家)") @ApiOperation("专家管理员新增专家)")
@WebLog("专家管理员新增专家")
public void expertBasicInfoSubmit(@Valid @RequestBody ExpertUserBasicInfoSubmitRequest request) { public void expertBasicInfoSubmit(@Valid @RequestBody ExpertUserBasicInfoSubmitRequest request) {
expertManage.expertBasicInfoSubmit(request); expertManage.expertBasicInfoSubmit(request);
} }
@@ -72,6 +75,7 @@ public class ExpertController {


@PostMapping("/basic-info-modify") @PostMapping("/basic-info-modify")
@ApiOperation("专家信息编辑") @ApiOperation("专家信息编辑")
@WebLog("专家信息编辑")
public ExpertBasicInfoModifyResultVO expertBasicInfoModify(@Valid @RequestBody AdminExpertBasicInfoModifyRequest request) { public ExpertBasicInfoModifyResultVO expertBasicInfoModify(@Valid @RequestBody AdminExpertBasicInfoModifyRequest request) {
// ExpertUserInfoValidator.expertBasicInfoModifyRequestValidate(request); // ExpertUserInfoValidator.expertBasicInfoModifyRequestValidate(request);
return expertAdminManage.adminModifyExpertBasicInfo(request); return expertAdminManage.adminModifyExpertBasicInfo(request);
@@ -79,6 +83,7 @@ public class ExpertController {


@PostMapping("/get-zzd-info") @PostMapping("/get-zzd-info")
@ApiOperation("获取浙政钉用户信息") @ApiOperation("获取浙政钉用户信息")
@WebLog("获取浙政钉用户信息")
public ZzdInfoByMobileVO getZzdInfo(@Valid @RequestBody GetZzdInfoRequest request) { public ZzdInfoByMobileVO getZzdInfo(@Valid @RequestBody GetZzdInfoRequest request) {
return expertAdminManage.getZzdInfo(request); return expertAdminManage.getZzdInfo(request);
} }


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertMetaApplyController.java View File

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.expert.controller;




import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.expert.manage.ExpertMetaApplyManage; import com.ningdatech.pmapi.expert.manage.ExpertMetaApplyManage;
import com.ningdatech.pmapi.expert.model.cmd.MetaApplyListQuery; import com.ningdatech.pmapi.expert.model.cmd.MetaApplyListQuery;
import com.ningdatech.pmapi.expert.model.req.MetaApplyResultRequest; import com.ningdatech.pmapi.expert.model.req.MetaApplyResultRequest;
@@ -46,6 +47,7 @@ public class ExpertMetaApplyController {


@PostMapping("/revoke/{applyId}") @PostMapping("/revoke/{applyId}")
@ApiOperation(value = "申请撤销") @ApiOperation(value = "申请撤销")
@WebLog("申请撤销")
public void metaApplyRevoke(@PathVariable Long applyId) { public void metaApplyRevoke(@PathVariable Long applyId) {
expertMetaApplyManage.metaApplyRevoke(applyId); expertMetaApplyManage.metaApplyRevoke(applyId);
} }


+ 4
- 0
pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertReviewController.java View File

@@ -41,6 +41,7 @@ public class ExpertReviewController {


@GetMapping("/detail/{meetingId}/{projectId}/{userId}") @GetMapping("/detail/{meetingId}/{projectId}/{userId}")
@ApiOperation("获取专家评审详情") @ApiOperation("获取专家评审详情")
@WebLog("获取专家评审详情")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "专家ID"), @ApiImplicitParam(name = "userId", value = "专家ID"),
@ApiImplicitParam(name = "projectId", value = "项目ID") @ApiImplicitParam(name = "projectId", value = "项目ID")
@@ -57,6 +58,7 @@ public class ExpertReviewController {
@ApiImplicitParam(name = "meetingId", value = "会议ID") @ApiImplicitParam(name = "meetingId", value = "会议ID")
}) })
@ApiOperation("查看组员评审意见") @ApiOperation("查看组员评审意见")
@WebLog("查看组员评审意见")
public List<ExpertReviewDetailVO> listForGroupLeader(@PathVariable Long meetingId, public List<ExpertReviewDetailVO> listForGroupLeader(@PathVariable Long meetingId,
@PathVariable Long projectId) { @PathVariable Long projectId) {
return expertReviewManage.listReviews(projectId, meetingId, true); return expertReviewManage.listReviews(projectId, meetingId, true);
@@ -68,6 +70,7 @@ public class ExpertReviewController {
@ApiImplicitParam(name = "meetingId", value = "会议ID") @ApiImplicitParam(name = "meetingId", value = "会议ID")
}) })
@ApiOperation("查看项目某次会议的所有评审意见") @ApiOperation("查看项目某次会议的所有评审意见")
@WebLog("查看项目某次会议的所有评审意见")
public List<ExpertReviewDetailVO> list(@PathVariable Long meetingId, public List<ExpertReviewDetailVO> list(@PathVariable Long meetingId,
@PathVariable Long projectId) { @PathVariable Long projectId) {
return expertReviewManage.listReviews(projectId, meetingId, false); return expertReviewManage.listReviews(projectId, meetingId, false);
@@ -78,6 +81,7 @@ public class ExpertReviewController {
@ApiImplicitParam(name = "projectCode", value = "项目编号"), @ApiImplicitParam(name = "projectCode", value = "项目编号"),
}) })
@ApiOperation("查看项目的所有评审意见") @ApiOperation("查看项目的所有评审意见")
@WebLog("查看项目的所有评审意见")
public ProjectReviewDetailVO projectExpertReviewDetail(@PathVariable String projectCode) { public ProjectReviewDetailVO projectExpertReviewDetail(@PathVariable String projectCode) {
return expertReviewManage.projectExpertReviewDetail(projectCode); return expertReviewManage.projectExpertReviewDetail(projectCode);
} }


+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/DocumentationController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.filemanage.controller; package com.ningdatech.pmapi.filemanage.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.filemanage.manage.DocumentationManage; import com.ningdatech.pmapi.filemanage.manage.DocumentationManage;
import com.ningdatech.pmapi.filemanage.model.dto.DocumentationGroupSaveDTO; import com.ningdatech.pmapi.filemanage.model.dto.DocumentationGroupSaveDTO;
import com.ningdatech.pmapi.filemanage.model.dto.DocumentationSaveDTO; import com.ningdatech.pmapi.filemanage.model.dto.DocumentationSaveDTO;
@@ -37,12 +38,14 @@ public class DocumentationController {


@PostMapping("/group/add") @PostMapping("/group/add")
@ApiOperation(value = "分组添加", notes = "分组添加") @ApiOperation(value = "分组添加", notes = "分组添加")
@WebLog("档案管理-资料文档-分组添加")
public String addGroup(@Validated @RequestBody DocumentationGroupSaveDTO dto){ public String addGroup(@Validated @RequestBody DocumentationGroupSaveDTO dto){
return documentationManage.addGroup(dto); return documentationManage.addGroup(dto);
} }


@PostMapping("/group/delete/{id}") @PostMapping("/group/delete/{id}")
@ApiOperation(value = "分组删除", notes = "分组删除") @ApiOperation(value = "分组删除", notes = "分组删除")
@WebLog("档案管理-资料文档-分组删除")
public String deleteGroup(@PathVariable Long id){ public String deleteGroup(@PathVariable Long id){
return documentationManage.deleteGroup(id); return documentationManage.deleteGroup(id);
} }
@@ -61,12 +64,14 @@ public class DocumentationController {


@PostMapping("/add") @PostMapping("/add")
@ApiOperation(value = "文档添加", notes = "文档添加") @ApiOperation(value = "文档添加", notes = "文档添加")
@WebLog("档案管理-资料文档-文档添加")
public String addDoc(@Validated @RequestBody DocumentationSaveDTO dto){ public String addDoc(@Validated @RequestBody DocumentationSaveDTO dto){
return documentationManage.addDoc(dto); return documentationManage.addDoc(dto);
} }


@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
@ApiOperation(value = "文档删除", notes = "文档删除") @ApiOperation(value = "文档删除", notes = "文档删除")
@WebLog("档案管理-资料文档-文档删除")
public String deleteDoc(@PathVariable Long id){ public String deleteDoc(@PathVariable Long id){
return documentationManage.deleteDoc(id); return documentationManage.deleteDoc(id);
} }


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/filemanage/controller/ProjectFileController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.filemanage.controller; package com.ningdatech.pmapi.filemanage.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.filemanage.manage.ProjectFileManage; import com.ningdatech.pmapi.filemanage.manage.ProjectFileManage;
import com.ningdatech.pmapi.filemanage.model.param.ProjectFileListParam; import com.ningdatech.pmapi.filemanage.model.param.ProjectFileListParam;
import com.ningdatech.pmapi.filemanage.model.vo.ProjectFileListVO; import com.ningdatech.pmapi.filemanage.model.vo.ProjectFileListVO;
@@ -40,6 +41,7 @@ public class ProjectFileController {


@PostMapping("/want-read/{projectId}") @PostMapping("/want-read/{projectId}")
@ApiOperation(value = "申请借阅", notes = "申请借阅") @ApiOperation(value = "申请借阅", notes = "申请借阅")
@WebLog("档案管理-项目档案-申请借阅")
public String wantRead(@PathVariable Long projectId){ public String wantRead(@PathVariable Long projectId){
return projectFileManage.wantRead(projectId); return projectFileManage.wantRead(projectId);
} }


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.fiscal.controller; package com.ningdatech.pmapi.fiscal.controller;




import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.fiscal.manage.CompanyFiscalCodeManage; import com.ningdatech.pmapi.fiscal.manage.CompanyFiscalCodeManage;
import com.ningdatech.pmapi.fiscal.model.po.ReqCompanyFiscalCodeAndSealSnPO; import com.ningdatech.pmapi.fiscal.model.po.ReqCompanyFiscalCodeAndSealSnPO;
import com.ningdatech.pmapi.fiscal.model.po.ReqGetCompanyFiscalCodeAndSealSnPO; import com.ningdatech.pmapi.fiscal.model.po.ReqGetCompanyFiscalCodeAndSealSnPO;
@@ -33,6 +34,7 @@ public class CompanyFiscalCodeController {


@ApiOperation(value = "财政编码-配置", notes = "财政编码配置") @ApiOperation(value = "财政编码-配置", notes = "财政编码配置")
@PostMapping("/fiscal-and-seal/configure") @PostMapping("/fiscal-and-seal/configure")
@WebLog("财政编码-配置")
public void fiscalAndSealCodeConfigure(@Valid @RequestBody ReqCompanyFiscalCodeAndSealSnPO reqCompanyFiscalCodeAndSealSnPO) { public void fiscalAndSealCodeConfigure(@Valid @RequestBody ReqCompanyFiscalCodeAndSealSnPO reqCompanyFiscalCodeAndSealSnPO) {
companyFiscalCodeManage.fiscalCodeConfigure(reqCompanyFiscalCodeAndSealSnPO); companyFiscalCodeManage.fiscalCodeConfigure(reqCompanyFiscalCodeAndSealSnPO);
} }


+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/leave/controller/ExpertLeaveController.java View File

@@ -4,6 +4,7 @@ package com.ningdatech.pmapi.leave.controller;
import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.exception.BizException;
import com.ningdatech.basic.model.IdVo; import com.ningdatech.basic.model.IdVo;
import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.leave.entity.po.LeaveCreateReq; import com.ningdatech.pmapi.leave.entity.po.LeaveCreateReq;
import com.ningdatech.pmapi.leave.entity.po.LeaveListByCreatorReq; import com.ningdatech.pmapi.leave.entity.po.LeaveListByCreatorReq;
import com.ningdatech.pmapi.leave.entity.vo.LeaveDetailVO; import com.ningdatech.pmapi.leave.entity.vo.LeaveDetailVO;
@@ -35,6 +36,7 @@ public class ExpertLeaveController {


@ApiOperation("请假") @ApiOperation("请假")
@PostMapping("/save") @PostMapping("/save")
@WebLog("请假")
public IdVo<Long> askForLeave(@Valid @RequestBody LeaveCreateReq po) { public IdVo<Long> askForLeave(@Valid @RequestBody LeaveCreateReq po) {
return leaveManage.askForLeave(po); return leaveManage.askForLeave(po);
} }
@@ -50,18 +52,21 @@ public class ExpertLeaveController {
} }


@ApiOperation("我的请假列表(发起人)") @ApiOperation("我的请假列表(发起人)")
@WebLog("我的请假列表(发起人)")
@GetMapping("/leaveListByCreator") @GetMapping("/leaveListByCreator")
public PageVo<LeaveListItemVO> leaveListByCreator(LeaveListByCreatorReq po) { public PageVo<LeaveListItemVO> leaveListByCreator(LeaveListByCreatorReq po) {
return leaveManage.leaveListByCreator(po); return leaveManage.leaveListByCreator(po);
} }


@ApiOperation("销假") @ApiOperation("销假")
@WebLog("销假")
@GetMapping("/endLeave") @GetMapping("/endLeave")
public void endLeave(Long leaveId) { public void endLeave(Long leaveId) {
leaveManage.endLeave(leaveId); leaveManage.endLeave(leaveId);
} }


@ApiOperation("撤销") @ApiOperation("撤销")
@WebLog("撤销")
@GetMapping("/cancel") @GetMapping("/cancel")
public void cancelLeave(Long leaveId) { public void cancelLeave(Long leaveId) {
leaveManage.cancel(leaveId); leaveManage.cancel(leaveId);


+ 0
- 3
pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/DashboardController.java View File

@@ -41,21 +41,18 @@ public class DashboardController {


@ApiOperation("待办:专家评价列表") @ApiOperation("待办:专家评价列表")
@GetMapping("/todo/expertEvaluation") @GetMapping("/todo/expertEvaluation")
@WebLog(value = "待办:专家评价列表")
public PageVo<ExpertEvaluationToDoListItemVO> expertEvaluationToDo(PagePo po) { public PageVo<ExpertEvaluationToDoListItemVO> expertEvaluationToDo(PagePo po) {
return dashboardManage.expertEvaluationToDo(po); return dashboardManage.expertEvaluationToDo(po);
} }


@ApiOperation("待办:专家待替换列表") @ApiOperation("待办:专家待替换列表")
@GetMapping("/todo/expertReplace") @GetMapping("/todo/expertReplace")
@WebLog(value = "待办:专家待替换列表")
public PageVo<ExpertReplaceTodoListItemVO> expertReplaceToDo(PagePo po) { public PageVo<ExpertReplaceTodoListItemVO> expertReplaceToDo(PagePo po) {
return dashboardManage.expertReplaceTodoList(po); return dashboardManage.expertReplaceTodoList(po);
} }


@ApiOperation("待办:专家待确认列表") @ApiOperation("待办:专家待确认列表")
@GetMapping("/todo/expertConfirm") @GetMapping("/todo/expertConfirm")
@WebLog(value = "待办:专家待确认列表")
public PageVo<MeetingConfirmToDoListItemVO> expertConfirmToDo(PagePo po) { public PageVo<MeetingConfirmToDoListItemVO> expertConfirmToDo(PagePo po) {
return dashboardManage.expertConfirmToDo(po); return dashboardManage.expertConfirmToDo(po);
} }


+ 0
- 3
pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java View File

@@ -70,21 +70,18 @@ public class MeetingController {


@ApiOperation("管理员会议列表") @ApiOperation("管理员会议列表")
@GetMapping("/manager/meetingList") @GetMapping("/manager/meetingList")
@WebLog(value = "管理员会议列表")
public PageVo<MeetingByManagerVO> meetingListByManager(MeetingListReq req) { public PageVo<MeetingByManagerVO> meetingListByManager(MeetingListReq req) {
return meetingManage.meetingListForManager(req); return meetingManage.meetingListForManager(req);
} }


@ApiOperation("专家会议列表") @ApiOperation("专家会议列表")
@GetMapping("/expert/meetingList") @GetMapping("/expert/meetingList")
@WebLog(value = "专家会议列表")
public PageVo<MeetingByManagerVO> meetingListByExpert(MeetingListReq po) { public PageVo<MeetingByManagerVO> meetingListByExpert(MeetingListReq po) {
return meetingManage.meetingListForExpert(po); return meetingManage.meetingListForExpert(po);
} }


@ApiOperation("专家请假会议列表") @ApiOperation("专家请假会议列表")
@GetMapping("/expert/meetingListForLeave") @GetMapping("/expert/meetingListForLeave")
@WebLog(value = "专家请假会议列表")
public PageVo<MeetingByManagerVO> meetingListForLeave(MeetingLeaveListReq req) { public PageVo<MeetingByManagerVO> meetingListForLeave(MeetingLeaveListReq req) {
return meetingManage.meetingListForLeave(req); return meetingManage.meetingListForLeave(req);
} }


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.meta.controller; package com.ningdatech.pmapi.meta.controller;




import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.meta.manage.MetaManage; import com.ningdatech.pmapi.meta.manage.MetaManage;
import com.ningdatech.pmapi.meta.model.po.ReqAddDictionaryPO; import com.ningdatech.pmapi.meta.model.po.ReqAddDictionaryPO;
import com.ningdatech.pmapi.meta.model.po.ReqDictionaryListPO; import com.ningdatech.pmapi.meta.model.po.ReqDictionaryListPO;
@@ -49,12 +50,14 @@ public class MetaDictionaryManageController {


@PostMapping("/add/dictionary") @PostMapping("/add/dictionary")
@ApiOperation("添加字典值") @ApiOperation("添加字典值")
@WebLog("添加字典值")
public void addDictionary(@Valid @RequestBody ReqAddDictionaryPO reqAddDictionaryPO) { public void addDictionary(@Valid @RequestBody ReqAddDictionaryPO reqAddDictionaryPO) {
metaManage.addDictionary(reqAddDictionaryPO); metaManage.addDictionary(reqAddDictionaryPO);
} }


@PostMapping("/remove/dictionary/{dictionaryCode}") @PostMapping("/remove/dictionary/{dictionaryCode}")
@ApiOperation("删除字典值") @ApiOperation("删除字典值")
@WebLog("删除字典值")
public void removeDictionary(@PathVariable String dictionaryCode) { public void removeDictionary(@PathVariable String dictionaryCode) {
metaManage.removeDictionary(dictionaryCode); metaManage.removeDictionary(dictionaryCode);
} }


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.meta.controller; package com.ningdatech.pmapi.meta.controller;




import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.meta.manage.MetaManage; import com.ningdatech.pmapi.meta.manage.MetaManage;
import com.ningdatech.pmapi.meta.model.po.ReqAddTagTypePO; import com.ningdatech.pmapi.meta.model.po.ReqAddTagTypePO;
import com.ningdatech.pmapi.meta.model.po.ReqTagListPO; import com.ningdatech.pmapi.meta.model.po.ReqTagListPO;
@@ -66,12 +67,14 @@ public class MetaTagManageController {


@PostMapping("/add/tag-type") @PostMapping("/add/tag-type")
@ApiOperation("新增标签分类") @ApiOperation("新增标签分类")
@WebLog("新增标签分类")
public void addTagType(@Valid @RequestBody ReqAddTagTypePO request) { public void addTagType(@Valid @RequestBody ReqAddTagTypePO request) {
metaManage.addTagType(request); metaManage.addTagType(request);
} }


@PostMapping("/remove/tag/{tagCode}") @PostMapping("/remove/tag/{tagCode}")
@ApiOperation("删除标签") @ApiOperation("删除标签")
@WebLog("删除标签")
public void removeTagName(@PathVariable String tagCode) { public void removeTagName(@PathVariable String tagCode) {
metaManage.removeTagName(tagCode); metaManage.removeTagName(tagCode);
} }


+ 1
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java View File

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.organization.controller;




import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.organization.manage.OrganizationManage; import com.ningdatech.pmapi.organization.manage.OrganizationManage;
import com.ningdatech.pmapi.organization.model.po.ReqOrganizationListPO; import com.ningdatech.pmapi.organization.model.po.ReqOrganizationListPO;
import com.ningdatech.pmapi.organization.model.po.ReqSynthesizePO; import com.ningdatech.pmapi.organization.model.po.ReqSynthesizePO;


+ 1
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.organization.controller; package com.ningdatech.pmapi.organization.controller;




import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.organization.manage.GovBusinessStripManage; import com.ningdatech.pmapi.organization.manage.GovBusinessStripManage;
import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO; import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO;
import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO; import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO;


+ 6
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.organization.controller; package com.ningdatech.pmapi.organization.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.wflow.bean.dto.WflowOrgProcdefDto; import com.wflow.bean.dto.WflowOrgProcdefDto;
import com.wflow.bean.vo.OrgProcdefVo; import com.wflow.bean.vo.OrgProcdefVo;
import com.wflow.service.OrgProcdefService; import com.wflow.service.OrgProcdefService;
@@ -45,12 +46,14 @@ public class ProcDefController {


@ApiOperation(value = "单位流程配置保存", notes = "单位流程配置保存") @ApiOperation(value = "单位流程配置保存", notes = "单位流程配置保存")
@PostMapping("/save") @PostMapping("/save")
@WebLog("单位流程配置保存")
public String save(@Validated @RequestBody WflowOrgProcdefDto wflowOrgProcdefDto) { public String save(@Validated @RequestBody WflowOrgProcdefDto wflowOrgProcdefDto) {
return orgProcessModelService.saveProcess(wflowOrgProcdefDto); return orgProcessModelService.saveProcess(wflowOrgProcdefDto);
} }


@ApiOperation(value = "单位流程配置启用", notes = "单位流程配置启用") @ApiOperation(value = "单位流程配置启用", notes = "单位流程配置启用")
@PutMapping("/enable/{processDefId}") @PutMapping("/enable/{processDefId}")
@WebLog("单位流程配置启用")
public String enableProcess(@PathVariable String processDefId) { public String enableProcess(@PathVariable String processDefId) {
orgProcessModelService.enableProcess(processDefId, Boolean.FALSE); orgProcessModelService.enableProcess(processDefId, Boolean.FALSE);
return "启用成功"; return "启用成功";
@@ -58,6 +61,7 @@ public class ProcDefController {


@ApiOperation(value = "单位流程配置禁用", notes = "单位流程配置禁用") @ApiOperation(value = "单位流程配置禁用", notes = "单位流程配置禁用")
@PutMapping("/disable/{processDefId}") @PutMapping("/disable/{processDefId}")
@WebLog("单位流程配置禁用")
public String disableProcess(@PathVariable String processDefId) { public String disableProcess(@PathVariable String processDefId) {
orgProcessModelService.enableProcess(processDefId, Boolean.TRUE); orgProcessModelService.enableProcess(processDefId, Boolean.TRUE);
return "禁用成功"; return "禁用成功";
@@ -65,12 +69,14 @@ public class ProcDefController {


@ApiOperation(value = "单位流程配置部署", notes = "单位流程配置部署") @ApiOperation(value = "单位流程配置部署", notes = "单位流程配置部署")
@PostMapping("/deploy/{processDefId}") @PostMapping("/deploy/{processDefId}")
@WebLog("单位流程配置部署")
public String deploy(@Validated @PathVariable String processDefId) { public String deploy(@Validated @PathVariable String processDefId) {
return orgProcessModelService.deployProcess(processDefId, null); return orgProcessModelService.deployProcess(processDefId, null);
} }


@ApiOperation(value = "单位流程配置删除", notes = "单位流程配置删除") @ApiOperation(value = "单位流程配置删除", notes = "单位流程配置删除")
@PostMapping("/delete/{processDefId}") @PostMapping("/delete/{processDefId}")
@WebLog("单位流程配置删除")
public Boolean delete(@PathVariable String processDefId) { public Boolean delete(@PathVariable String processDefId) {
return orgProcessModelService.delProcess(processDefId); return orgProcessModelService.delProcess(processDefId);
} }


+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java View File

@@ -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.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelDownUtil;
import com.ningdatech.pmapi.projectdeclared.manage.ConstructionManage; import com.ningdatech.pmapi.projectdeclared.manage.ConstructionManage;
import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage;
@@ -45,6 +46,7 @@ public class ConstructionController {


@GetMapping("/contract/export") @GetMapping("/contract/export")
@ApiOperation("待合同备案的项目列表导出") @ApiOperation("待合同备案的项目列表导出")
@WebLog("待合同备案的项目列表导出")
public void exportList(ProjectListReq req, HttpServletResponse response){ public void exportList(ProjectListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,constructionManage::exportList); ExcelDownUtil.downXls(response,req,constructionManage::exportList);
} }
@@ -56,6 +58,7 @@ public class ConstructionController {
} }


@ApiOperation(value = "填写合同信息", notes = "填写合同信息") @ApiOperation(value = "填写合同信息", notes = "填写合同信息")
@WebLog("填写合同信息")
@PostMapping("/submit-contract") @PostMapping("/submit-contract")
public String submitContract(@Validated @RequestBody ContractSaveDTO dto) { public String submitContract(@Validated @RequestBody ContractSaveDTO dto) {
return constructionManage.submitContract(dto); return constructionManage.submitContract(dto);
@@ -69,6 +72,7 @@ public class ConstructionController {


@GetMapping("/pre-ins/export") @GetMapping("/pre-ins/export")
@ApiOperation("待初验备案的项目列表导出") @ApiOperation("待初验备案的项目列表导出")
@WebLog("待初验备案的项目列表导出")
public void exportPreList(ProjectListReq req, HttpServletResponse response){ public void exportPreList(ProjectListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,constructionManage::exportPreList); ExcelDownUtil.downXls(response,req,constructionManage::exportPreList);
} }
@@ -80,6 +84,7 @@ public class ConstructionController {
} }


@ApiOperation(value = "填写初验信息", notes = "填写初验信息") @ApiOperation(value = "填写初验信息", notes = "填写初验信息")
@WebLog("填写初验信息")
@PostMapping("/submit-pre-ins") @PostMapping("/submit-pre-ins")
public String submitPreIns(@Validated @RequestBody PreInsSaveDTO dto) { public String submitPreIns(@Validated @RequestBody PreInsSaveDTO dto) {
return constructionManage.submitPreIns(dto); return constructionManage.submitPreIns(dto);


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java View File

@@ -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.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelDownUtil;
import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage; import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage;
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
@@ -38,6 +39,7 @@ public class ConstructionPlanController {
} }


@ApiOperation(value = "建设方案申报", notes = "建设方案申报") @ApiOperation(value = "建设方案申报", notes = "建设方案申报")
@WebLog("建设方案申报")
@PostMapping("/start") @PostMapping("/start")
public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) {
String instanceId = constructionPlanManage.startTheProcess(dto); String instanceId = constructionPlanManage.startTheProcess(dto);
@@ -46,6 +48,7 @@ public class ConstructionPlanController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("可申报建设方案项目列表导出") @ApiOperation("可申报建设方案项目列表导出")
@WebLog("可申报建设方案项目列表导出")
public void exportList(ConstrctionPlanListReq planReq, HttpServletResponse response) { public void exportList(ConstrctionPlanListReq planReq, HttpServletResponse response) {
ExcelDownUtil.downXls(response, planReq, constructionPlanManage::exportList); ExcelDownUtil.downXls(response, planReq, constructionPlanManage::exportList);
} }


+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java View File

@@ -4,6 +4,7 @@ import java.util.Iterator;


import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;


import com.ningdatech.log.annotation.WebLog;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -83,12 +84,14 @@ public class DeclaredProjectController {
} }


@ApiOperation(value = "申报项目保存至草稿箱", notes = "申报项目保存至草稿箱") @ApiOperation(value = "申报项目保存至草稿箱", notes = "申报项目保存至草稿箱")
@WebLog("申报项目保存至草稿箱")
@PostMapping("/save-to-draft") @PostMapping("/save-to-draft")
public Object saveToDraft(@Validated @RequestBody ProjectDraftSaveDTO dto) { public Object saveToDraft(@Validated @RequestBody ProjectDraftSaveDTO dto) {
return declaredProjectManage.saveToDraft(dto); return declaredProjectManage.saveToDraft(dto);
} }


@ApiOperation(value = "申报项目", notes = "申报项目") @ApiOperation(value = "申报项目", notes = "申报项目")
@WebLog("申报项目")
@PostMapping("/start") @PostMapping("/start")
public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) {
String instanceId = declaredProjectManage.startTheProcess(dto); String instanceId = declaredProjectManage.startTheProcess(dto);
@@ -96,6 +99,7 @@ public class DeclaredProjectController {
} }


@ApiOperation(value = "重新申报项目", notes = "重新申报项目") @ApiOperation(value = "重新申报项目", notes = "重新申报项目")
@WebLog("重新申报项目")
@PostMapping("/restart") @PostMapping("/restart")
public String reStartTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { public String reStartTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) {
return projectAdjustmentManage.adjustment(dto); return projectAdjustmentManage.adjustment(dto);
@@ -103,6 +107,7 @@ public class DeclaredProjectController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("申报项目列表导出") @ApiOperation("申报项目列表导出")
@WebLog("申报项目列表导出")
public void exportList(ProjectListReq req, HttpServletResponse response){ public void exportList(ProjectListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,declaredProjectManage::exportList); ExcelDownUtil.downXls(response,req,declaredProjectManage::exportList);
} }


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java View File

@@ -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.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelDownUtil;
import com.ningdatech.pmapi.projectdeclared.manage.DelayedApplyManage; import com.ningdatech.pmapi.projectdeclared.manage.DelayedApplyManage;
import com.ningdatech.pmapi.projectdeclared.model.dto.DelayedApplyDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.DelayedApplyDTO;
@@ -38,11 +39,13 @@ public class DelayedApplyController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("过期的项目列表导出") @ApiOperation("过期的项目列表导出")
@WebLog("过期的项目列表导出")
public void exportList(ProjectListReq req, HttpServletResponse response){ public void exportList(ProjectListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,delayedApplyManage::exportList); ExcelDownUtil.downXls(response,req,delayedApplyManage::exportList);
} }


@ApiOperation(value = "延期申报", notes = "延期申报") @ApiOperation(value = "延期申报", notes = "延期申报")
@WebLog("延期申报")
@PostMapping("/apply") @PostMapping("/apply")
public String delayedApply(@Validated @RequestBody DelayedApplyDTO dto) { public String delayedApply(@Validated @RequestBody DelayedApplyDTO dto) {
String instanceId = delayedApplyManage.startDelayedApplyProcess(dto); String instanceId = delayedApplyManage.startDelayedApplyProcess(dto);


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/FinalAcceptanceController.java View File

@@ -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.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelDownUtil;
import com.ningdatech.pmapi.projectdeclared.manage.FinalAcceptanceManage; import com.ningdatech.pmapi.projectdeclared.manage.FinalAcceptanceManage;
import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
@@ -40,6 +41,7 @@ public class FinalAcceptanceController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("待终验申报的项目导出") @ApiOperation("待终验申报的项目导出")
@WebLog("待终验申报的项目导出")
public void exportList(ProjectListReq req, HttpServletResponse response){ public void exportList(ProjectListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,finalAcceptanceManage::exportList); ExcelDownUtil.downXls(response,req,finalAcceptanceManage::exportList);
} }
@@ -51,6 +53,7 @@ public class FinalAcceptanceController {
} }


@ApiOperation(value = "终验申报", notes = "终验申报") @ApiOperation(value = "终验申报", notes = "终验申报")
@WebLog("终验申报")
@PostMapping("/start-process") @PostMapping("/start-process")
public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) {
String instanceId = finalAcceptanceManage.startProcess(dto); String instanceId = finalAcceptanceManage.startProcess(dto);


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java View File

@@ -1,5 +1,6 @@
package com.ningdatech.pmapi.projectdeclared.controller; package com.ningdatech.pmapi.projectdeclared.controller;


import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.projectdeclared.manage.IrsManage; import com.ningdatech.pmapi.projectdeclared.manage.IrsManage;
import com.ningdatech.pmapi.projectdeclared.model.vo.IrsApplicationVO; import com.ningdatech.pmapi.projectdeclared.model.vo.IrsApplicationVO;
import com.ningdatech.pmapi.projectdeclared.model.vo.PiotTasksVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PiotTasksVO;
@@ -28,12 +29,14 @@ public class IrsController {
private final IrsManage irsManage; private final IrsManage irsManage;


@ApiOperation(value = "irs应用列表", notes = "irs应用列表") @ApiOperation(value = "irs应用列表", notes = "irs应用列表")
@WebLog("irs应用列表")
@GetMapping("/application-list") @GetMapping("/application-list")
public List<IrsApplicationVO> applicationList() { public List<IrsApplicationVO> applicationList() {
return irsManage.applicationList(); return irsManage.applicationList();
} }


@ApiOperation(value = "试点任务列表", notes = "试点任务列表") @ApiOperation(value = "试点任务列表", notes = "试点任务列表")
@WebLog("试点任务列表")
@GetMapping("/piot-tasks") @GetMapping("/piot-tasks")
public List<PiotTasksVO> piotTasks() { public List<PiotTasksVO> piotTasks() {
return irsManage.listPiotTasks(); return irsManage.listPiotTasks();


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java View File

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.controller;


import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;


import com.ningdatech.log.annotation.WebLog;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@@ -40,6 +41,7 @@ public class PrequalificationDeclaredController {
} }


@ApiOperation(value = "申报预审", notes = "申报预审") @ApiOperation(value = "申报预审", notes = "申报预审")
@WebLog("申报预审")
@PostMapping("/start") @PostMapping("/start")
public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) {
return prequalificationDeclaredProjectManage.startTheProcess(dto); return prequalificationDeclaredProjectManage.startTheProcess(dto);
@@ -47,6 +49,7 @@ public class PrequalificationDeclaredController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("可预审申报项目列表导出") @ApiOperation("可预审申报项目列表导出")
@WebLog("可预审申报项目列表导出")
public void exportList(PrequalificationDeclaredListReq preReq, HttpServletResponse response){ public void exportList(PrequalificationDeclaredListReq preReq, HttpServletResponse response){
ExcelDownUtil.downXls(response,preReq,prequalificationDeclaredProjectManage::exportList); ExcelDownUtil.downXls(response,preReq,prequalificationDeclaredProjectManage::exportList);
} }


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java View File

@@ -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.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; 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;
@@ -41,6 +42,7 @@ public class ProjectAdjustmentController {
} }


@ApiOperation(value = "项目内容调整", notes = "项目内容调整") @ApiOperation(value = "项目内容调整", notes = "项目内容调整")
@WebLog("项目内容调整")
@PostMapping @PostMapping
public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) { public String startTheProcess(@Validated @RequestBody DefaultDeclaredDTO dto) {
String instanceId = projectAdjustmentManage.adjustment(dto); String instanceId = projectAdjustmentManage.adjustment(dto);
@@ -49,6 +51,7 @@ public class ProjectAdjustmentController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("项目内容调整列表导出") @ApiOperation("项目内容调整列表导出")
@WebLog("项目内容调整列表导出")
public void exportList(AdjustmentListReq preReq, HttpServletResponse response){ public void exportList(AdjustmentListReq preReq, HttpServletResponse response){
ExcelDownUtil.downXls(response,preReq,projectAdjustmentManage::exportList); ExcelDownUtil.downXls(response,preReq,projectAdjustmentManage::exportList);
} }


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PurchaseController.java View File

@@ -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.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelDownUtil;
import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage; import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage;
import com.ningdatech.pmapi.projectdeclared.manage.PurchaseManage; import com.ningdatech.pmapi.projectdeclared.manage.PurchaseManage;
@@ -47,11 +48,13 @@ public class PurchaseController {


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("待采购结果备案列表导出") @ApiOperation("待采购结果备案列表导出")
@WebLog("待采购结果备案列表导出")
public void exportList(ProjectListReq req, HttpServletResponse response){ public void exportList(ProjectListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,purchaseManage::exportList); ExcelDownUtil.downXls(response,req,purchaseManage::exportList);
} }


@ApiOperation(value = "填写采购结果", notes = "填写采购结果") @ApiOperation(value = "填写采购结果", notes = "填写采购结果")
@WebLog("填写采购结果")
@PostMapping("/submit-result") @PostMapping("/submit-result")
public String submitResult(@Validated @RequestBody PurchaseSaveDTO dto) { public String submitResult(@Validated @RequestBody PurchaseSaveDTO dto) {
return purchaseManage.submitResult(dto); return purchaseManage.submitResult(dto);


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java View File

@@ -37,6 +37,7 @@ public class AnnualPlanController {


@GetMapping("/list") @GetMapping("/list")
@ApiOperation("年度计划库列表") @ApiOperation("年度计划库列表")
@WebLog("年度计划库列表")
public PageVo<AnnualPlanListItemVO> annualPlanLibList(ProjectListReq req) { public PageVo<AnnualPlanListItemVO> annualPlanLibList(ProjectListReq req) {
return annualPlanLibManage.annulPlanLibList(req); return annualPlanLibManage.annulPlanLibList(req);
} }
@@ -78,12 +79,14 @@ public class AnnualPlanController {


@PostMapping("/exportList") @PostMapping("/exportList")
@ApiOperation("项目(增补)库列表导出") @ApiOperation("项目(增补)库列表导出")
@WebLog("项目(增补)库列表导出")
public void exportList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response) { public void exportList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response) {
annualPlanLibManage.exportList(param, response); annualPlanLibManage.exportList(param, response);
} }


@PostMapping("/exportModifyList") @PostMapping("/exportModifyList")
@ApiOperation("项目(增补)库编辑表导出") @ApiOperation("项目(增补)库编辑表导出")
@WebLog("项目(增补)库编辑表导出")
public void exportModifyList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response) { public void exportModifyList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response) {
annualPlanLibManage.exportModifyList(param, response); annualPlanLibManage.exportModifyList(param, response);
} }


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.projectlib.controller; package com.ningdatech.pmapi.projectlib.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.common.helper.UserInfoHelper;
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;
@@ -57,6 +58,7 @@ public class ProjectLibController {


@PostMapping("/exportList") @PostMapping("/exportList")
@ApiOperation("项目库列表导出") @ApiOperation("项目库列表导出")
@WebLog("项目库列表导出")
private void exportList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response){ private void exportList(@Valid @RequestBody ProjectListReq param, HttpServletResponse response){
projectLibManage.exportList(param,response); projectLibManage.exportList(param,response);
} }


+ 8
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectRenewalFundDeclarationController.java View File

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectlib.controller;




import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelDownUtil;
import com.ningdatech.pmapi.projectlib.manage.ProjectRenewalFundManage; import com.ningdatech.pmapi.projectlib.manage.ProjectRenewalFundManage;
import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO;
@@ -33,42 +34,49 @@ public class ProjectRenewalFundDeclarationController {


@GetMapping("/list") @GetMapping("/list")
@ApiOperation("项目续建资金库") @ApiOperation("项目续建资金库")
@WebLog("项目续建资金库")
public PageVo<ProjectRenewalFundDeclarationVO> list(ProjectRenewalListReq req) { public PageVo<ProjectRenewalFundDeclarationVO> list(ProjectRenewalListReq req) {
return projectRenewalFundManage.list(req); return projectRenewalFundManage.list(req);
} }


@GetMapping("/{id}") @GetMapping("/{id}")
@ApiOperation("项目续建资金详情") @ApiOperation("项目续建资金详情")
@WebLog("项目续建资金详情")
private ProjectRenewalFundDeclarationVO detail (@PathVariable Long id){ private ProjectRenewalFundDeclarationVO detail (@PathVariable Long id){
return projectRenewalFundManage.detail(id); return projectRenewalFundManage.detail(id);
} }


@PostMapping("/declared") @PostMapping("/declared")
@ApiOperation("项目续建资金申请") @ApiOperation("项目续建资金申请")
@WebLog("项目续建资金申请")
private Long declared (@Validated @RequestBody ProjectRenewalFundDeclarationDTO dto){ private Long declared (@Validated @RequestBody ProjectRenewalFundDeclarationDTO dto){
return projectRenewalFundManage.declared(dto); return projectRenewalFundManage.declared(dto);
} }


@PostMapping("/audit") @PostMapping("/audit")
@ApiOperation("续建项目审核") @ApiOperation("续建项目审核")
@WebLog("续建项目审核")
private Long audit(@Validated @RequestBody ProjectRenewalAuditReq param){ private Long audit(@Validated @RequestBody ProjectRenewalAuditReq param){
return projectRenewalFundManage.audit(param); return projectRenewalFundManage.audit(param);
} }


@DeleteMapping("/delete/{projectRenewalId}") @DeleteMapping("/delete/{projectRenewalId}")
@ApiOperation("续建项目删除") @ApiOperation("续建项目删除")
@WebLog("续建项目删除")
private Long delete(@PathVariable("projectRenewalId") Long projectRenewalId){ private Long delete(@PathVariable("projectRenewalId") Long projectRenewalId){
return projectRenewalFundManage.delete(projectRenewalId); return projectRenewalFundManage.delete(projectRenewalId);
} }


@GetMapping("/export") @GetMapping("/export")
@ApiOperation("项目库续建项目列表导出") @ApiOperation("项目库续建项目列表导出")
@WebLog("项目库续建项目列表导出")
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") @GetMapping("/exportRenewalDeclare")
@ApiOperation("申报管理续建项目资金申报列表导出") @ApiOperation("申报管理续建项目资金申报列表导出")
@WebLog("申报管理续建项目资金申报列表导出")
private void exportRenewalDeclareList(ProjectRenewalListReq req, HttpServletResponse response){ private void exportRenewalDeclareList(ProjectRenewalListReq req, HttpServletResponse response){
ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportRenewalDeclareList); ExcelDownUtil.downXls(response,req,projectRenewalFundManage::exportRenewalDeclareList);
} }


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/sms/controller/VerificationCodeController.java View File

@@ -1,5 +1,6 @@
package com.ningdatech.pmapi.sms.controller; package com.ningdatech.pmapi.sms.controller;


import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.sms.constant.VerificationCodeType; import com.ningdatech.pmapi.sms.constant.VerificationCodeType;
import com.ningdatech.pmapi.sms.manage.SmsManage; import com.ningdatech.pmapi.sms.manage.SmsManage;
import com.ningdatech.pmapi.sms.model.po.ReqVerificationCodePO; import com.ningdatech.pmapi.sms.model.po.ReqVerificationCodePO;
@@ -34,6 +35,7 @@ public class VerificationCodeController {
*/ */
@ApiOperation(value = "发送验证码", notes = "发送验证码") @ApiOperation(value = "发送验证码", notes = "发送验证码")
@PostMapping(value = "/send") @PostMapping(value = "/send")
@WebLog("发送验证码")
public void send(@Validated @RequestBody ReqVerificationCodePO request) { public void send(@Validated @RequestBody ReqVerificationCodePO request) {
smsManage.sendVerificationCode(request); smsManage.sendVerificationCode(request);
} }


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java View File

@@ -1,5 +1,6 @@
package com.ningdatech.pmapi.sys.controller; package com.ningdatech.pmapi.sys.controller;


import com.ningdatech.log.annotation.WebLog;
import com.wflow.bean.dto.WflowFormsDto; import com.wflow.bean.dto.WflowFormsDto;
import com.wflow.bean.vo.WflowFormVo; import com.wflow.bean.vo.WflowFormVo;
import com.wflow.workflow.service.WflowFormsService; import com.wflow.workflow.service.WflowFormsService;
@@ -33,6 +34,7 @@ public class FormController {
} }


@ApiOperation(value = "编辑系统表单", notes = "编辑系统表单") @ApiOperation(value = "编辑系统表单", notes = "编辑系统表单")
@WebLog("编辑系统表单")
@PostMapping("/modify") @PostMapping("/modify")
public String modify(@Validated @RequestBody WflowFormsDto dto) { public String modify(@Validated @RequestBody WflowFormsDto dto) {
return formService.modifySysForm(dto); return formService.modifySysForm(dto);


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NotifyController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.sys.controller; package com.ningdatech.pmapi.sys.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.sys.manage.NotifyManage; import com.ningdatech.pmapi.sys.manage.NotifyManage;
import com.ningdatech.pmapi.sys.model.req.NotifyListReq; import com.ningdatech.pmapi.sys.model.req.NotifyListReq;
import com.ningdatech.pmapi.sys.model.vo.NotifyVO; import com.ningdatech.pmapi.sys.model.vo.NotifyVO;
@@ -39,6 +40,7 @@ public class NotifyController {


@PostMapping("/read/{id}") @PostMapping("/read/{id}")
@ApiOperation("已读") @ApiOperation("已读")
@WebLog("消息-已读")
public Boolean read(@PathVariable Long id) { public Boolean read(@PathVariable Long id) {
return notifyManage.read(id); return notifyManage.read(id);
} }


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcDefController.java View File

@@ -1,6 +1,7 @@
package com.ningdatech.pmapi.sys.controller; package com.ningdatech.pmapi.sys.controller;


import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage; import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
import com.wflow.bean.dto.WflowModelHistorysDto; import com.wflow.bean.dto.WflowModelHistorysDto;
import com.wflow.bean.vo.WflowModelVo; import com.wflow.bean.vo.WflowModelVo;
@@ -50,6 +51,7 @@ public class SysProcDefController {


@ApiOperation(value = "系统流程配置保存", notes = "系统流程配置保存") @ApiOperation(value = "系统流程配置保存", notes = "系统流程配置保存")
@PostMapping("/save") @PostMapping("/save")
@WebLog("系统流程配置保存")
public String save(@Validated @RequestBody WflowModelHistorysDto dto) { public String save(@Validated @RequestBody WflowModelHistorysDto dto) {
return processModelService.saveProcess(dto); return processModelService.saveProcess(dto);
} }
@@ -64,6 +66,7 @@ public class SysProcDefController {


@ApiOperation(value = "系统流程配置发布", notes = "系统流程配置发布") @ApiOperation(value = "系统流程配置发布", notes = "系统流程配置发布")
@PostMapping("/deploy/{formId}") @PostMapping("/deploy/{formId}")
@WebLog("系统流程配置发布")
public String deploy(@Validated @PathVariable String formId) { public String deploy(@Validated @PathVariable String formId) {
return processModelService.deployProcess(formId,null); return processModelService.deployProcess(formId,null);
} }


+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java View File

@@ -66,6 +66,7 @@ public class TodoCenterController {
* @return void * @return void
*/ */
@PostMapping("/todo-list/export") @PostMapping("/todo-list/export")
@WebLog("待办中心-待我处理项目列表导出")
public void exportPendingProjectList(@Valid @RequestBody ToBeProcessedExportReq param, public void exportPendingProjectList(@Valid @RequestBody ToBeProcessedExportReq param,
HttpServletResponse response){ HttpServletResponse response){
todoCenterManage.exportTodoList(response,param); todoCenterManage.exportTodoList(response,param);
@@ -87,6 +88,7 @@ public class TodoCenterController {
* @return 操作结果 * @return 操作结果
*/ */
@PostMapping("/handler") @PostMapping("/handler")
@WebLog("审核通过,盖章并通过、退回、撤回、驳回等操作")
public Object handler(@Valid @RequestBody ReqProcessHandlerDTO param) { public Object handler(@Valid @RequestBody ReqProcessHandlerDTO param) {
String nextTaskId = todoCenterManage.handler(param); String nextTaskId = todoCenterManage.handler(param);
return nextTaskId; return nextTaskId;
@@ -161,18 +163,21 @@ public class TodoCenterController {


@ApiOperation(value = "被退回项目内容调整并通过", notes = "被退回项目内容调整并通过") @ApiOperation(value = "被退回项目内容调整并通过", notes = "被退回项目内容调整并通过")
@PostMapping("/adjustAndHandle") @PostMapping("/adjustAndHandle")
@WebLog("被退回项目内容调整并通过")
public String startTheProcess(@Validated @RequestBody AdjustHandleDTO dto) { public String startTheProcess(@Validated @RequestBody AdjustHandleDTO dto) {
String instanceId = todoCenterManage.adjustmentAndHandle(dto); String instanceId = todoCenterManage.adjustmentAndHandle(dto);
return "退回项目内容调整并且重新通过 【" + instanceId + "】 成功"; return "退回项目内容调整并且重新通过 【" + instanceId + "】 成功";
} }


@ApiOperation("获取未签章的pdf文件") @ApiOperation("获取未签章的pdf文件")
@WebLog("获取未签章的pdf文件")
@PostMapping("/getNotSealedPdf/{projectId}") @PostMapping("/getNotSealedPdf/{projectId}")
public Long getNotSealedPdf (@Valid @PathVariable("projectId") Long projectId){ public Long getNotSealedPdf (@Valid @PathVariable("projectId") Long projectId){
return todoCenterManage.getNotSealedPdf(projectId); return todoCenterManage.getNotSealedPdf(projectId);
} }


@ApiOperation("获取签章后的pdf文件") @ApiOperation("获取签章后的pdf文件")
@WebLog("获取签章后的pdf文件")
@PostMapping("/getSealedPdf") @PostMapping("/getSealedPdf")
public Long getSealedPdf(@Valid @RequestBody SealInfoDTO req){ public Long getSealedPdf(@Valid @RequestBody SealInfoDTO req){
return todoCenterManage.getSealedPdf(req); return todoCenterManage.getSealedPdf(req);


+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java View File

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.user.controller;




import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.user.manage.UserInfoManage; import com.ningdatech.pmapi.user.manage.UserInfoManage;
import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO; import com.ningdatech.pmapi.user.model.po.ReqUserDetailEditPO;
import com.ningdatech.pmapi.user.model.po.ReqUserDetailPO; import com.ningdatech.pmapi.user.model.po.ReqUserDetailPO;
@@ -53,6 +54,7 @@ public class UserInfoController {


@ApiOperation(value = "用户详情编辑", notes = "用户详情编辑") @ApiOperation(value = "用户详情编辑", notes = "用户详情编辑")
@PostMapping("/detail/edit") @PostMapping("/detail/edit")
@WebLog("用户详情编辑")
public void userInfoDetailEdit(@Valid @RequestBody ReqUserDetailEditPO req) { public void userInfoDetailEdit(@Valid @RequestBody ReqUserDetailEditPO req) {
userInfoManage.userInfoDetailEdit(req); userInfoManage.userInfoDetailEdit(req);
} }


Loading…
Cancel
Save