diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IAttachmentController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IAttachmentController.java
index 8d8674e359de22fe792464d8a9dabfda1d674442..1d8e49de72ff400c9a924dab4bab7ba66e989b07 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IAttachmentController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IAttachmentController.java
@@ -1,17 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.attachment.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
/**
* iattachment鎺у埗鍣�
@@ -23,40 +13,4 @@ import java.util.List;
@RequestMapping("attachment")
public interface IAttachmentController {
- @PostMapping(path = "downloadAttachment")
- void downloadAttachment(HttpServletResponse response, @RequestBody AttachmentQry attachmentQry) throws IOException;
-
-
-
- @PostMapping(path = "removeAttachment")
- Object removeAttachment(@RequestBody AttachmentQry request) throws IOException;
-
- @PostMapping(path = "removeBatchAttachment")
- Object removeBatchAttachment(@RequestBody List<Long> idList) throws IOException;
-
-
-
- @PostMapping(path = "uploadAttachmentList")
- Object uploadAttachmentList(@RequestParam("files") MultipartFile[] files, AttachmentCmd request) throws Exception;
-
-
- /**
- * 鏇存柊闄勪欢鐨勭浉鍏虫€�
- *
- * @param attachmentRelevanceCmd 闄勪欢鐩稿叧cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "updateAttachmentRelevance")
- Result<Integer> updateAttachmentRelevance(@RequestBody AttachmentRelevanceCmd attachmentRelevanceCmd);
-
-
- /**
- * 鏌ヨ鏍＄骇瀹℃牳闄勪欢鍒楄〃
- * coordinate = 鏍＄骇瀹℃牳-year
- * parentId = 9
- * @param request 闄勪欢鐩稿叧cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "selectByCoordinateAndPid")
- Result<AttachmentInfoOut> selectByCoordinateAndPid(@RequestBody AttachmentQry request);
}
\ No newline at end of file
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java
index 6522a28a267fa85ecc510861bb7d959cfd0da83b..6883e90d5b1741a3ac5c29fab592865680e05108 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseConfigController.java
@@ -1,33 +1,8 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.baseconfig.budgetswitch.*;
-import com.seasky.projectplan.dto.baseconfig.devicetype.DeviceTypeCmd;
-import com.seasky.projectplan.dto.baseconfig.devicetype.DeviceTypeOut;
-import com.seasky.projectplan.dto.baseconfig.devicetype.DeviceTypeQry;
-import com.seasky.projectplan.dto.baseconfig.extendfrommanage.ExtendFormManageCmd;
-import com.seasky.projectplan.dto.baseconfig.extendfrommanage.ExtendFormManageOut;
-import com.seasky.projectplan.dto.baseconfig.extendfrommanage.ExtendFormManageQry;
-import com.seasky.projectplan.dto.baseconfig.informationtype.InformationTypeCmd;
-import com.seasky.projectplan.dto.baseconfig.informationtype.InformationTypeOut;
-import com.seasky.projectplan.dto.baseconfig.informationtype.InformationTypeQry;
-import com.seasky.projectplan.dto.baseconfig.informationtype.InformationTypeTree1;
-import com.seasky.projectplan.dto.baseconfig.personfund.PersonFundCmd;
-import com.seasky.projectplan.dto.baseconfig.personfund.PersonFundOut;
-import com.seasky.projectplan.dto.baseconfig.personfund.PersonFundQry;
-import com.seasky.projectplan.dto.baseconfig.personfund.PersonTemplateExport;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
/**
* ibase閰嶇疆API
@@ -40,253 +15,4 @@ import java.util.List;
@RequestMapping("baseConfig")
public interface IBaseConfigController {
- @PostMapping("/loginUserInfo")
- Result<Object> loginUserInfo();
-
- @PostMapping("/saveBudgetSwitch")
- Result<Object> saveBudgetSwitch(@RequestBody BudgetSwitchCmd cmd);
-
- @PostMapping("/initBudgetDeptSwitch")
- Result<Object> initBudgetDeptSwitch(@RequestBody InitBudgetCmd type);
-
-
- @PostMapping("/openDeptSwitch")
- Result<Object> openDeptSwitch(@RequestBody List<Long> ids);
-
- @PostMapping("/closeDeptSwitch")
- Result<Object> closeDeptSwitch(@RequestBody List<Long> ids);
-
- @PostMapping("/queryBudgetSwitchDetail")
- Result<Boolean> queryBudgetSwitchDetail(@RequestBody BudgetSwitchQry qry);
-
- @PostMapping("/judgeCurrentUserDeptAtDeptSwitch")
- Result<Boolean> judgeCurrentUserDeptAtDeptSwitch(@RequestBody BudgetSwitchQry qry);
-
- @PostMapping("/queryBudgetDeptSwitchDetail")
- Result<BudgetSwitchOut> queryBudgetDeptSwitchDetail(@RequestBody BudgetSwitchQry qry );
-
- @PostMapping("/saveExtendFormManage")
- Result<Object> saveExtendFormManage(@RequestBody @Valid List<ExtendFormManageCmd> cmd);
-
- @PostMapping("/deleteExtendFormManage")
- Result<Object> deleteExtendFormManage(@RequestBody List<Long> ids);
-
- @PostMapping("/openExtendFormManage")
- Result<Object> openExtendFormManage(@RequestBody List<Long> ids);
-
- @PostMapping("/closeExtendFormManage")
- Result<Object> closeExtendFormManage(@RequestBody List<Long> ids);
-
- @PostMapping("/queryExtendFormById")
- Result<ExtendFormManageOut> queryExtendFormById(@RequestParam("id") Long id);
- @PostMapping("/queryExtendFormPage")
- Result<ExtendFormManageOut> queryExtendFormPage(@RequestBody ExtendFormManageQry qry);
- /**
- * 涓嬭浇 绉戠洰鎵╁睍琛ㄨ缃� 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/downLoadExtendFormTemplate")
- void downLoadExtendFormTemplate(HttpServletRequest request, HttpServletResponse response);
- /**
- * 瀵煎叆 绉戠洰鎵╁睍琛ㄨ缃�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importExtendForm")
- Result<Object> importExtendForm(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
- /**
- * 瀵煎嚭 绉戠洰鎵╁睍琛ㄨ缃�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param qry 椤圭洰鏃ュ父璁″垝qry
- */
- @PostMapping(path = "/exportExtendForm")
- void exportExtendForm(HttpServletRequest request, HttpServletResponse response, ExtendFormManageQry qry);
-
- @PostMapping("/exportExtendFormPage")
- void exportExtendFormPage(HttpServletRequest request, HttpServletResponse response, @RequestBody ExtendFormManageQry qry);
-
- @PostMapping("/queryExtendFormByTable")
- Result<ExtendFormManageOut> queryExtendFormByTable(@RequestParam("extendName") String extendName);
-
- @PostMapping("/queryExtendFormName")
- Result<String> queryExtendFormName();
-
- @PostMapping("/saveDeviceType")
- Result<Object> saveDeviceType(@RequestBody List<DeviceTypeCmd> cmd);
-
- @PostMapping("/deleteDeviceType")
- Result<Object> deleteDeviceType(@RequestBody List<Long> ids);
-
- @PostMapping("/queryDeviceTypeById")
- Result<DeviceTypeOut> queryDeviceTypeById(@RequestParam("id") Long id);
-
- @PostMapping("/queryDevicePage")
- Result<DeviceTypeOut> queryDevicePage(@RequestBody DeviceTypeQry qry);
-
- @PostMapping("/queryDeviceList")
- Result<DeviceTypeOut> queryDeviceList();
- /**
- * 涓嬭浇 璁惧绫诲瀷 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/downLoadDeviceTypeTemplate")
- void downLoadDeviceTypeTemplate(HttpServletRequest request, HttpServletResponse response);
- /**
- * 瀵煎叆 璁惧绫诲瀷
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importDeviceType")
- Result<Object> importDeviceType(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
- /**
- * 瀵煎嚭 璁惧绫诲瀷
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/exportDeviceType")
- void exportDeviceType(HttpServletRequest request, HttpServletResponse response);
-
- @PostMapping("/saveInformationType")
- Result<Object> saveInformationType(@RequestBody List<InformationTypeCmd> cmd);
-
- @PostMapping("/deleteInformationType")
- Result<Object> deleteInformationType(@RequestBody List<Long> ids);
-
- @PostMapping("/queryInformationById")
- Result<InformationTypeOut> queryInformationById(@RequestParam("id") Long id);
- @PostMapping("/queryInformation")
- Result<InformationTypeOut> queryInformation(@RequestBody InformationTypeQry qry);
- @PostMapping("/queryInformationTree")
- Result<InformationTypeTree1> queryInformationTree();
- /**
- * 涓嬭浇 淇℃伅鍖栫被鍨� 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/downLoadInformationTemplate")
- void downLoadInformationTemplate(HttpServletRequest request, HttpServletResponse response);
- /**
- * 瀵煎嚭 淇℃伅鍖栫被鍨�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/exportInformation")
- void exportInformation(HttpServletRequest request, HttpServletResponse response);
- /**
- * 瀵煎叆 淇℃伅鍖栫被鍨�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importInformation")
- Result<Object> importInformation(HttpServletRequest request, HttpServletResponse response,@RequestParam(value = "file") MultipartFile file);
-
-
-
-
- @PostMapping("/savePersonFund")
- Result<Object> savePersonFund(@RequestBody List<PersonFundCmd> cmd);
-
- @PostMapping("/deletePersonFund")
- Result<Object> deletePersonFund(@RequestBody List<Long> ids);
-
- @PostMapping("/queryPersonFundById")
- Result<Object> queryPersonFundById(@RequestParam("id") Long id);
-
- @PostMapping("/queryPersonFundPage")
- Result<PersonFundOut> queryPersonFundPage(@RequestBody PersonFundQry qry);
-
- /**
- * 涓嬭浇 浜哄憳缁忚垂 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/downLoadPersonFundTemplate")
- void downLoadPersonFundTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 涓嬭浇 浜哄憳缁忚垂 瀵煎叆妯℃澘(鏂�)
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link PersonFundOut}>
- */
- @PostMapping(path = "/downLoadPersonFundTemplateNew")
- Result<PersonTemplateExport> downLoadPersonFundTemplateNew(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎叆(鍓嶇鐢�,涓昏涓轰簡浼犳暟鎹�)
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importNew")
- Result<PersonTemplateExport> importNew(HttpServletRequest request,HttpServletResponse response,MultipartFile file);
- /**
- * 瀵煎嚭 浜哄憳缁忚垂
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/exportPersonFund")
- void exportPersonFund(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎嚭浜哄憳缁忚垂(鏂�)
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param id id
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportPersonFundNew")
- Result<Object> exportPersonFundNew(HttpServletRequest request,HttpServletResponse response,@RequestParam Long id);
- /**
- * 瀵煎叆 浜哄憳缁忚垂
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importPersonFund")
- Result<Object> importPersonFund(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
-
- @PostMapping("/queryPersonFundList")
- Result<PersonFundOut> queryPersonFundList();
-
- @PostMapping("/queryConfigYearByType")
- Result<Integer> queryConfigYearByType(@RequestParam("type") String type);
-
- /**
- * 鎸囧畾鏂囨。鍚姩娴佺▼
- *
- * @return {@link Result<Integer>}
- */
- @PostMapping("/startFlowByDocument")
- Result<Integer> startFlowByDocument();
-
- @PostMapping("/queryPersonCodeAndName")
- Result<PersonFundOut> queryPersonCodeAndName();
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseInfoController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseInfoController.java
index 727e578dc34a4344fc4661154e4793d4c745b450..187fe5c01be904c0522ed8c6ce03fab7c8288355 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseInfoController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBaseInfoController.java
@@ -1,21 +1,8 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Pagination;
-import com.seasky.core.common.Result;
-import com.seasky.micro.basedata.dto.MenuDTO;
-import com.seasky.micro.basedata.dto.OrganizationDTO;
-import com.seasky.micro.basedata.dto.UserDTO;
-import com.seasky.projectplan.dto.baseconfig.DeptQry;
-import com.seasky.projectplan.dto.baseconfig.LoginOut;
-import com.seasky.projectplan.dto.baseconfig.OrganizationSystemOut;
-import com.seasky.projectplan.dto.baseconfig.UserQry;
-import com.seasky.projectplan.dto.budgetinfo.TemplateOut;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.List;
-
/**
* 鍩虹鏁版嵁鎺у埗鍣�
*
@@ -26,23 +13,4 @@ import java.util.List;
@RequestMapping("baseinfo")
public interface IBaseInfoController {
- @PostMapping(path = "/queryCurrentUserDeptList")
- Result<OrganizationDTO> queryCurrentUserDeptList();
- @PostMapping(path = "/queryCurrentUserName")
- Result<String> queryCurrentUserName();
- @PostMapping(path = "/queryCurrentUserDepartmentHead")
- Result<UserDTO> queryCurrentUserDepartmentHead();
- @PostMapping(path = "/queryUserPage")
- Result<UserDTO> queryUserPage(UserQry userQry);
- @PostMapping(path = "/queryDeptPage")
- Result<OrganizationSystemOut> queryDeptPage(DeptQry deptQry);
- @PostMapping(path = "/listMenuByCurUser")
- Result<MenuDTO> listMenuByCurUser();
- @PostMapping(path = "/listSecondaryMenu")
- Result<MenuDTO> listSecondaryMenu();
- @PostMapping(path = "/listChildrenMenu")
- Result<MenuDTO> listChildrenMenu(Long id);
- @PostMapping(path = "/loginOut")
- LoginOut loginOut();
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBudgetInfo.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBudgetInfo.java
index df805a72fe618e3129d2416e0c77d2c935fbce9c..9c1fa28284631b2742dea778cc72a0cf0fe160ba 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBudgetInfo.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IBudgetInfo.java
@@ -1,21 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.ResponseCode;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.budgetinfo.*;
-import com.seasky.projectplan.dto.fund.FundOut;
-import com.seasky.projectplan.dto.fund.FundTreeOut;
-import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-import static com.seasky.core.common.Response.ok;
/**
* 椤圭洰绫诲瀷API
@@ -27,191 +13,4 @@ import static com.seasky.core.common.Response.ok;
@RequestMapping("budgetInfo")
public interface IBudgetInfo {
- /**
- * 鍒涘缓椤圭洰绫诲瀷
- *
- * @param budgetInfoCmd 棰勭畻淇℃伅cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/createBudgetInfo")
- Result<Long> saveBudgetInfo(BudgetInfoCmd budgetInfoCmd);
-
- /**
- * 鍒涘缓椤圭洰绫诲瀷锛堝彧鍏佽鍒涘缓浜岀骇鍙婂叾浠ヤ笅椤圭洰绫诲瀷锛�
- *
- * @param budgetInfoCmd 棰勭畻淇℃伅cmd
- * @return Long
- */
- @PostMapping(path = "/verifyCreateBudgetInfo")
- Result<Long> verifyCreateBudgetInfo(BudgetInfoCmd budgetInfoCmd);
-
- /**
- * 鍒犻櫎椤圭洰绫诲瀷
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeBudgetInfo")
- Result<Integer> removeBudgetInfo(List<Long> ids);
-
- /**
- * 瀵煎叆椤圭洰绫诲瀷
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importBudgetInfo")
- Result<Object> importBudgetInfo(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎嚭椤圭洰绫诲瀷
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/exportBudgetInfo")
- Result<Object> exportBudgetInfo(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 椤圭洰绫诲瀷瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importBudgetInfoTemplate")
- Result<Object> importBudgetInfoTemplate(HttpServletRequest request, HttpServletResponse response);
-
- //浠ヤ笅 Q绾�
-
- /**
- * 鏌ヨ缁忔祹绉戠洰鏄庣粏
- *
- * @param id id
- * @return {@link Result< FundOut >}
- */
- @PostMapping(path = "/queryBudgetInfo")
- Result<BudgetInfoOut> queryBudgetInfoById(Long id);
-
- /**
- * 鏌ヨ椤圭洰绫诲瀷淇℃伅 鏍�
- *
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return {@link Result<FundTreeOut>}
- */
- @PostMapping("queryBudgetInfoTree")
- Result<BudgetInfoTreeOut> queryBudgetInfoListTree(BudgetInfoQry budgetInfoQry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜虹殑閮ㄩ棬鏄惁鍦ㄩ」鐩殑褰掑彛閮ㄩ棬涓睍绀洪」鐩被鍨嬩俊鎭爲
- *
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return Result<BudgetInfoTreeOut>
- */
- @PostMapping("queryBudgetInfoTreeByUser")
- Result<BudgetInfoTreeOut> queryBudgetInfoListTreeByUser(BudgetInfoQry budgetInfoQry);
-
- /**
- * 閫氳繃鐖惰妭鐐筰d 鍒嗛〉 鏌ヨ椤圭洰绫诲瀷淇℃伅椤甸潰
- * 鏌ヨ璇d涓嬫墍鏈夊瓙绾ч」鐩被鍨嬩俊鎭�
- * 褰掑彛椤圭洰绫诲瀷
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return {@link Result<BudgetInfoOut>}
- */
- @PostMapping(path = "/queryBudgetInfoPageByPId")
- Result<BudgetInfoOut> queryBudgetInfoPageByPId(BudgetInfoQry budgetInfoQry);
-
-
- /**
- * 閫氳繃鐖惰妭鐐筰d 鍒嗛〉 鏌ヨ椤圭洰绫诲瀷淇℃伅椤甸潰
- * 鏌ヨ璇d涓嬫墍鏈夊瓙绾ч」鐩被鍨嬩俊鎭�
- * 鍒嗙被椤圭洰搴�
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return {@link Result<BudgetInfoOut>}
- */
- @PostMapping(path = "/queryUserBudgetInfoPageByPId")
- Result<BudgetInfoOut> queryUserBudgetInfoPageByPId(BudgetInfoQry budgetInfoQry);
-
- /**
- * 鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂� 鍙敤椤圭洰绫诲瀷 鍒楄〃
- * 鐢虫姤搴�
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return {@link Result<BudgetInfoOut>}
- */
- @PostMapping(path = "/queryBudgetInfoListByCurrentUserDept")
- Result<BudgetInfoOut> queryBudgetInfoListByCurrentUserDept(BudgetInfoQry budgetInfoQry);
-
- /**
- * 鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂� 鍙敤椤圭洰绫诲瀷 鍒楄〃
- * 褰掑彛閮ㄩ棬鐢虫姤
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return {@link Result<BudgetInfoOut>}
- */
- @PostMapping(path = "/queryGuiKouBudgetInfoListByCurrentUserDept")
- Result<BudgetInfoOut> queryGuiKouBudgetInfoListByCurrentUserDept(BudgetInfoQry budgetInfoQry);
-
- /**
- * 鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂� 鍙敤鏃ュ父缁忚垂鍒楄〃
- * @param budgetInfoQry 棰勭畻淇℃伅鍏ュ弬Qry
- * @return {@link Result<BudgetInfoOut>}
- */
- @PostMapping(path = "/queryRiChangBudgetInfoListByDept")
- Result<BudgetInfoOut> queryRiChangBudgetInfoListByDept(BudgetInfoQry budgetInfoQry);
-
- /**
- * 鏌ヨ鎵€鏈夊彾瀛愯妭鐐归」鐩被鍨嬩俊鎭�
- * @param budgetInfoQry 棰勭畻淇℃伅qry
- * @return {@link Result<BudgetInfoOut>}
- */
- @PostMapping(path = "/queryLeafNodeBudgetInfoPage")
- Result<BudgetInfoOut> queryLeafNodeBudgetInfoPage(BudgetInfoQry budgetInfoQry);
-
- /**
- * 鏌ヨ妯℃澘淇℃伅
- * @param templateName 妯℃澘鍚嶇О
- * @return {@link Result<TemplateOut>}
- */
- //@PostMapping(path = "/queryTemplateInfo")
- //Result<TemplateOut> queryTemplateInfo(String templateName);
-
- /**
- * 鍒嗙被椤圭洰搴撳鍏ユā鏉�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importProjectLibraryTemplate")
- Result<Object> importProjectLibraryTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 鍒嗙被椤圭洰搴撳鍏�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importProjectLibrary")
- Result<Object> importProjectLibrary(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 鍒嗙被椤圭洰搴撳鍑�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportProjectLibrary")
- Result<Object> exportProjectLibrary(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 鏌ヨ妯℃澘浠ｇ爜
- *
- * @return {@link Result}<{@link TemplateOut}>
- */
- @PostMapping(path = "/queryTemplateCode")
- Result<com.seasky.projectplan.dto.fundTemplateLimit.TemplateOut> queryTemplateCode();
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFund.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFund.java
index b6d73acfd82d36deb2b1ee7c798f1168c1bf202a..a2fa8838469859bcef33acc7b29f31f0642fa6b9 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFund.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFund.java
@@ -1,15 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.fund.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* 缁忔祹绉戠洰API
@@ -21,100 +13,4 @@ import java.util.List;
@RequestMapping("fund")
public interface IFund {
- /**
- * 鍒涘缓缁忔祹绉戠洰
- *
- * @param fundCmd 缁忔祹绉戠洰cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/createFund")
- Result<Long> saveFund(FundCmd fundCmd);
-
- /**
- * 鍒犻櫎缁忔祹绉戠洰
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeFund")
- Result<Integer> removeFund(List<Long> ids);
-
-
-
- //浠ヤ笅 Q绾�
-
- /**
- * 鏌ヨ缁忔祹绉戠洰鏄庣粏
- *
- * @param id id
- * @return {@link Result<FundOut>}
- */
- @PostMapping(path = "/queryFund")
- Result<FundOut> queryFundById(Long id);
-
- /**
- * 鏌ヨ缁忔祹绉戠洰鏍�
- *
- * @param fundQry 缁忔祹绉戠洰鍏ュ弬Qry
- * @return {@link Result<FundTreeOut>}
- */
- @PostMapping("queryFundTree")
- Result<FundTreeOut> queryFundListTree(FundQry fundQry);
-
- /**
- * 閫氳繃鐖惰妭鐐筰d 鍒嗛〉 鏌ヨ缁忔祹绉戠洰
- *
- * @param fundQry 缁忔祹绉戠洰鍏ュ弬Qry
- * @return {@link Result<FundOut>}
- */
- @PostMapping(path = "/queryFundPageByPId")
- Result<FundOut> queryFundPageByParentNodeId(FundQry fundQry);
-
- /**
- * 閫氳繃椤圭洰绫诲瀷id 鏌ヨ缁忔祹绉戠洰淇℃伅json
- * 璇ラ」鐩被鍨嬬殑鍙娇鐢ㄧ粡娴庣鐩甁SON
- * @param budgetInfoId 缁忔祹绉戠洰id
- * @return {@link Result<FundOut>}
- */
- @PostMapping(path = "/queryFundListByBudgetId")
- Result<InfoCanUseFundOut> queryFundListByBudgetId(Long budgetInfoId);
-
- /**
- * 瀵煎叆缁忔祹绉戠洰
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importFund")
- Result<Object> importFund(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎叆缁忔祹绉戠洰妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importFundTemplate")
- Result<Object> importFundTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎嚭缁忔祹绉戠洰
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/exportFund")
- Result<Object> exportFund(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 鑾峰彇鍏敤缁忚垂鐨勭粡娴庣鐩�
- *
- * @return {@link Result<FundOut>}
- */
- @PostMapping(path = "/queryDailyFund")
- Result<FundOut> queryDailyFund();
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFundTemplateLimitController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFundTemplateLimitController.java
index 2338f66fcc58714f46dd6bdf742587f13499714e..a08e2cf4f1188f41e7941686c0318923cc0b0e20 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFundTemplateLimitController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IFundTemplateLimitController.java
@@ -1,14 +1,8 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.fund.FundOut;
-import com.seasky.projectplan.dto.fundTemplateLimit.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.List;
-
/**
* Description锛�
@@ -20,38 +14,5 @@ import java.util.List;
@RequestMapping("fundTemplateLimit")
public interface IFundTemplateLimitController {
- /**
- * 鑾峰彇鎸囨爣妯℃澘鍒楄〃
- *
- * @return {@link Result}<{@link TemplateOut}>
- */
- @PostMapping(path = "/listBusinessTemplate")
- Result<TemplateOut> listBusinessTemplate(FundTemplateQuery fundTemplateQuery);
-
- /**
- * 鏍规嵁妯℃澘鏌ヨ缁忔祹绉戠洰鎵€瀵瑰簲鐨勯搴�
- *
- * @return {@link Result}<{@link FundOut}>
- */
- @PostMapping(path = "/queryFundByYear")
- Result<FundLimitOut> queryFundByYear(String templateCode);
-
- /**
- * 閫氳繃妯℃澘缂栧彿鏌ラ搴︿俊鎭�
- *
- * @param templateCode 妯℃澘浠ｇ爜
- * @return {@link Result}<{@link ControlsOut}>
- */
- @PostMapping(path = "/queryLimitByTemplateCode")
- Result<ControlsOut> queryLimitByTemplateCode(String templateCode);
-
- /**
- * 淇濆瓨缁忔祹绉戠洰妯℃澘淇℃伅
- *
- * @param fundTemplateCmdList 鍩洪噾妯℃澘cmd鍒楄〃
- * @return {@link Result}<{@link Long}>
- */
- @PostMapping(path = "/saveFundTemplate")
- Result<Long> saveFundTemplate(List<FundTemplateCmd> fundTemplateCmdList);
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IInComePlanController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IInComePlanController.java
index ec3494ea7fcb7015b5be583c33e40d72400eb917..7741eb35ed6f0eb618626721d4a2304823b8a779 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IInComePlanController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IInComePlanController.java
@@ -1,21 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.fund.FundCmd;
-import com.seasky.projectplan.dto.fund.FundOut;
-import com.seasky.projectplan.dto.fund.FundQry;
-import com.seasky.projectplan.dto.fund.FundTreeOut;
-import com.seasky.projectplan.dto.incomeplan.*;
-import com.seasky.projectplan.dto.projectplan.ActionFlowCmd;
-import com.seasky.projectplan.dto.projectplan.ProjectInfoPlanQry;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* 鏀跺叆缂栧埗API
@@ -27,153 +13,4 @@ import java.util.List;
@RequestMapping("InComePlan")
public interface IInComePlanController {
- /**
- * 鏂板鎴栦慨鏀规敹鍏ョ紪鍒朵功锛堝叓椤逛笓鐢級
- *
- * @param inComePlanCmd 鏀跺叆缂栧埗cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveInComePlan")
- Result<Long> saveInComePlan(InComePlanCmd inComePlanCmd);
-
- /**
- * 鏂板鎴栦慨鏀规敹鍏ョ紪鍒朵功锛堝叾浠栵級
- *
- * @param inComePlanCmd 鏀跺叆缂栧埗cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveInComeSubPlan")
- Result<Long> saveInComeSubPlan(InComePlanSubCmd inComePlanCmd);
-
- /**
- * 閫昏緫鍒犻櫎鏀跺叆缂栧埗涔�
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeInComePlan")
- Result<Integer> removeInComePlan(List<Long> ids);
-
-
- //浠ヤ笅 Q绾�
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄨ幏鍙栧叾閮ㄩ棬鐨勬敹鍏ョ紪鍒朵俊鎭甫鍒嗛〉
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryInComePlanPageByCurrentUserDept")
- Result<InComePlanOut> queryInComePlanPageByCurrentUserDept(IncomeplanQry qry);
-
- /**
- * 鏍规嵁ID鏌ヨ鏀跺叆缂栧埗淇℃伅
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryInComeById")
- Result<InComePlanOut> queryInComeById(IncomeplanQry qry);
-
- /**
- * 杩斿洖鏀跺叆绫诲瀷鐨勬灇涓鹃泦鍚�
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryInComeTypeEnumList")
- Result<InComePlanOut> queryInComeTypeEnumList();
-
- /**
- * 鏄剧ず鎵€鏈夌殑鏀跺叆缂栧埗淇℃伅甯﹀垎椤�
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryInComePlanPage")
- Result<InComePlanOut> queryInComePlanPage(IncomeplanQry qry);
-
- /**
- * 鏀跺叆瀹℃壒鏌ヨ
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryInComePlanApprovalPage")
- Result<InComePlanOut> queryInComePlanApprovalPage(IncomeplanApprovalQry qry);
-
- /**
- * 鏀跺叆鐩戞帶鏌ヨ
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryInComePlanMonitorPage")
- Result<InComePlanOut> queryInComePlanMonitorPage(IncomeplanMonitorQry qry);
-
- /**
- * 杩斿洖瀛︾敓鏀跺叆绫诲瀷鐨勬灇涓鹃泦鍚�
- *
- * @return {@link Result<List<InComePlanOut>>}
- */
- @PostMapping(path = "/queryStudentTypeEnumList")
- Result<InComePlanOut> queryStudentTypeEnumList();
-
- /**
- * 鎻愪氦椤圭洰鐢虫姤涔�
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/submitInComePlan")
- Result<Integer> submitInComePlan(ActionFlowCmd actionFlowCmd);
-
- /**
- * 閫€鍥為」鐩敵鎶ヤ功
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/rollBackInComePlan")
- Result<Integer> rollBackInComePlan(ActionFlowCmd actionFlowCmd);
-
-
- /**
- * 鍙潵璁″垝
- *
- * @param id id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/reCallInComePlan")
- Result<Integer> reCallInComePlan(Long id);
-
- /**
- * 鎵归噺鎻愪氦椤圭洰鐢虫姤涔�
- *
- * @param actionFlowCmdList 鍔ㄤ綔娴乧md鍒楄〃
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/submitInComePlanList")
- Result<Integer> submitInComePlanList(List<ActionFlowCmd> actionFlowCmdList);
-
- /**
- * 鎵归噺閫€鍥為」鐩敵鎶ヤ功
- *
- * @param actionFlowCmdList 鍔ㄤ綔娴乧md鍒楄〃
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/rollBackInComePlanList")
- Result<Integer> rollBackInComePlanList(List<ActionFlowCmd> actionFlowCmdList);
-
- /**
- * 瀵煎嚭鏀跺叆淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param qry qry
- */
- @PostMapping(path = "/exportInComePlan")
- void exportInComePlan(HttpServletRequest request, HttpServletResponse response, IncomeplanMonitorQry qry);
-
- /**
- * 鍚屾涓€涓婃敹鍏�
- *
- * @param year 鏈勾
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/syncOneUpIncome")
- Result<Object> syncOneUpIncome( Integer year);
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPartyNumber.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPartyNumber.java
index 543b9ad10397248159f15cdf7bca6cd175a70803..b3b9a4cb432de5c44ff5a31381cb1f33a6179142 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPartyNumber.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPartyNumber.java
@@ -1,16 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.partyNumber.PartyNumberCmd;
-import com.seasky.projectplan.dto.partyNumber.PartyNumberOut;
-import com.seasky.projectplan.dto.partyNumber.PartyNumberQry;
+
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* Description锛�
*
@@ -21,69 +12,4 @@ import java.util.List;
@RequestMapping("partyNumber")
public interface IPartyNumber {
- /**
- * 淇濆瓨鍏氬憳浜烘暟
- *
- * @param partyNumberCmd 鏂规暟cmd
- * @return {@link Result}<{@link Long}>
- */
- @PostMapping(path = "/savePartyNumber")
- Result<Long> savePartyNumber(PartyNumberCmd partyNumberCmd);
-
- /**
- * 鍒犻櫎鍏氬憳浜烘暟
- *
- * @param ids id
- * @return {@link Result}<{@link Integer}>
- */
- @PostMapping(path = "/removePartyNumber")
- Result<Integer> removePartyNumber(List<Long> ids);
-
- /**
- * 鍒嗛〉鏌ヨ鍏氬憳浜烘暟淇℃伅
- *
- * @param partyNumberQry 鏂规暟qry
- * @return {@link Result}<{@link PartyNumberOut}>
- */
- @PostMapping(path = "/queryPartyNumber")
- Result<PartyNumberOut> queryPartyNumber(PartyNumberQry partyNumberQry);
-
- /**
- * 鏍规嵁id鏌ヨ鍏氬憳浜烘暟淇℃伅
- *
- * @param id id
- * @return {@link Result}<{@link PartyNumberOut}>
- */
- @PostMapping(path = "/queryPartyNumberById")
- Result<PartyNumberOut> queryPartyNumberById(Long id);
-
- /**
- * 涓嬭浇 鍏氬憳浜烘暟淇℃伅 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/downLoadPartyNumberTemplate")
- Result<Object> downLoadPartyNumberTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎嚭 鍏氬憳浜烘暟淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportPartyNumberInformation")
- Result<Object> exportPartyNumberInformation(HttpServletRequest request,HttpServletResponse response);
-
- /**
- * 瀵煎叆鍏氬憳浜烘暟淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importPartyNumber")
- Result<Object> importPartyNumber(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java
index 626adf3abab92c1d937223acc5cd45af1bc855fb..6474ad27066247476a419436e5356aca91a4c152 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPredictionController.java
@@ -5,150 +5,11 @@ package com.seasky.projectplan.api;
* @Data 2022/3/17 11:08
*/
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.projectplan.quotadeclaration.*;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.List;
-
@FeignClient("projectplan-provider")
@RequestMapping("projectLibrary")
public interface IPredictionController {
- /**
- * 鏌ヨ鎵€鏈変簩涓婇€氳繃瀹℃牳鐨勭紪鍒朵功
- *
- * @param projectPlanBookQry 椤圭洰瑙勫垝涔md
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @PostMapping("/queryYBInfo")
- Result<ProjectPlanBookOut> queryYBInfo(ProjectPlanBookQry projectPlanBookQry);
-
- /**
- * 淇濆瓨棰勬嫧璁惧畾锛堝崟涓級
- *
- * @param predictionKZMoneyCmd 棰勬祴kzmoney cmd
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/saveYBKZMoney")
- Result<Object> saveYBKZMoney(PredictionKZMoneyCmd predictionKZMoneyCmd);
-
- /**
- * 淇濆瓨棰勬嫧璁惧畾锛堝涓級
- *
- * @param predictionKZMoneyCmd 棰勬祴kzmoney cmd
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/saveYBKZMoneyList")
- Result<Object> saveYBKZMoneyList(List<PredictionKZMoneyCmd> predictionKZMoneyCmd);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘煡璇簩涓婂鏍稿畬鎴愮殑椤圭洰淇℃伅锛堥鎷ㄧ敵璇凤級
- *
- * @param projectPlanBookQry 椤圭洰瑙勫垝涔ry
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @PostMapping("/queryYBInfoByCurUser")
- Result<ProjectPlanBookOut> queryYBInfoByCurUser(ProjectPlanBookQry projectPlanBookQry);
-
-
- /**
- * 鏍规嵁projectplanbookid鑾峰彇琛ㄥ崟涓墍闇€瑕佺殑淇℃伅
- *
- * @param projectPlanBookId 椤圭洰瑙勫垝涔d
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @PostMapping("/queryBYById")
- Result<ProjectOut> queryBYById(Long projectPlanBookId);
-
- /**
- * 淇濆瓨棰勬嫧琛ㄥ崟
- *
- * @param projectCmd 椤圭洰cmd
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/saveByBook")
- Result<Object> saveByBook(ProjectCmd projectCmd);
-
- /**
- * 鎻愪氦棰勬嫧
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/SubmitQuotaDeclaration")
- Result<Object> SubmitQuotaDeclaration(ActionFlowCmd actionFlowCmd);
-
-
- /**
- * 鍥炴粴棰勬嫧
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/rollBackQuotaDeclaration")
- Result<Object> rollBackQuotaDeclaration(ActionFlowCmd actionFlowCmd);
-
- /**
- * 鍥炴挙棰勬嫧
- *
- * @param id 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/recallQuotaDeclaration")
- Result<Object> recallQuotaDeclaration(Long id);
-
-
- /**
- * 鏍规嵁棰勭畻缂栧埗涔︾殑ID鏌ヨ鍘嗗彶鐢宠琛ㄤ俊鎭�,鍒嗛〉
- *
- * @param ybHisInfoQry yb qry浠栦俊鎭�
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/queryYBHisInfoById")
- Result<YBHisInfoOut> queryYBHisInfoById(YBHisInfoQry ybHisInfoQry);
-
-
- /**
- * 鏄剧ず褰撳墠鐧诲綍浜烘墍闇€瑕佸鏍哥殑淇℃伅锛屽垎椤�
- *
- * @param ybExamineCmd yb妫€鏌md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/queryYBExamine")
- Result<YBExamineOut> queryYBExamine(YBExamineCmd ybExamineCmd);
-
-
- /**
- * 鏍规嵁鏂板缓琛╥d鑾峰彇琛ㄥ崟涓墍鏈夌殑淇℃伅
- *
- * @param id id
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/getBYById")
- Result<ProjectOut> getBYById(Long id);
-
-
- /**
- * 鍒犻櫎鍘嗗彶yb
- *
- * @param id id
- * @return {@link Result}<{@link ProjectOut}>
- */
- @PostMapping("/deleteHistoryYB")
- Result<Object> deleteHistoryYB(Long id);
-
- /**
- * 鍒ゆ柇鏄惁绔嬮」
- *
- * @param projectNo 椤圭洰娌℃湁
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/judge")
- Result<Object> judge(String projectNo);
-
-
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java
index a2f341c38ecee5f0d5ac7c9cf1f189cda61025a2..3f6d20b1af4818a67298f0ff0109b6b81059dcec 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectLibrary.java
@@ -1,185 +1,11 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.projectlibrary.*;
-import com.seasky.projectplan.dto.projectplan.ProjectPlanBookOut;
-import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
@FeignClient("projectplan-provider")
@RequestMapping("projectLibrary")
public interface IProjectLibrary {
- @ApiOperation("鎸夐」鐩被鍨媔d鏌ヨ椤圭洰璁″垝涔d")
- @PostMapping("/queryProjectPlanBookIdByProjectTypeId")
- Result<ProjectPlanBookOut> queryProjectPlanBookIdByProjectTypeId(@RequestParam Long id);
-
- @ApiOperation("1.鏂板淇敼椤圭洰")
- @PostMapping("/saveProjectLibrary")
- Result<Object> saveProjectLibrary(@RequestBody ProjectLibraryCmd cmd);
-
- @ApiOperation("鍒犻櫎椤圭洰搴撲俊鎭�")
- @PostMapping("/removeProjectLibrary")
- Result<Object> removeProjectLibrary(@RequestBody List<Long> idList);
-
- @ApiOperation("鎷疯礉鍘嗗彶椤圭洰浣滀负鏈勾椤圭洰搴撲俊鎭�")
- @PostMapping("/copyHistoryProjectLibrary")
- Result<Object> copyHistoryProjectLibrary(@RequestBody List<Long> idList);
-
- @ApiOperation("椤圭洰缁忚垂杩涘叆涓€涓�")
- @PostMapping("/enterProjectPlanType1")
- Result<Object> enterProjectPlanType1(@RequestParam Long id);
-
- @ApiOperation("椤圭洰缁忚垂杩涘叆浜屼笂")
- @PostMapping("/enterProjectPlanType2")
- Result<Object> enterProjectPlanType2(@RequestParam Long id);
-
- @ApiOperation("杩涘叆鎵瑰")
- @PostMapping("/enterPiFuProjectPlan")
- Result<Object> enterPiFuProjectPlan(@RequestParam Long id);
-
- @ApiOperation("鍙栨秷杩涘叆涓€涓�")
- @PostMapping("/cancelEnterProjectPlanType1")
- Result<Object> cancelEnterProjectPlanType1(@RequestParam Long id);
-
- @ApiOperation("鍙栨秷杩涘叆浜屼笂")
- @PostMapping("/cancelEnterProjectPlanType2")
- Result<Object> cancelEnterProjectPlanType2(@RequestParam Long id);
-
- @ApiOperation("鍙栨秷杩涘叆鎵瑰")
- @PostMapping("/cancelEnterPiFuProjectPlan")
- Result<Object> cancelEnterPiFuProjectPlan(@RequestParam Long id);
-
- /**
- * 鏈儴闂ㄩ」鐩簱
- * @param qry qry
- * @return {@link Result}<{@link ProjectLibraryOut}>
- */
- @PostMapping("/queryProjectLibraryPageByCurrentUserDept")
- Result<ProjectLibraryOut> queryProjectLibraryPageByCurrentUserDept(@RequestBody ProjectLibraryQry qry);
-
- /**
- * 鍒嗛〉鏄剧ず椤圭洰搴撲俊鎭�
- * @param qry qry
- * @return {@link Result}<{@link ProjectLibraryOut}>
- */
- @PostMapping("/queryProjectLibraryPage")
- Result<ProjectLibraryOut> queryProjectLibraryPage(@RequestBody ProjectLibraryQry qry);
-
- @ApiOperation("10.鑾峰彇鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑鍘嗗彶骞村害鐨勯」鐩簱淇℃伅(鍒嗛〉鏄剧ず)")
- @PostMapping("/queryHistoryProjectLibraryPageByCurrentUserDept")
- Result<ProjectLibraryOut> queryHistoryProjectLibraryPageByCurrentUserDept(@RequestBody ProjectLibraryQry qry);
-
- @ApiOperation("11.鑾峰彇椤圭洰搴撲笅鎷夋")
- @PostMapping("/getPlanTypeEnum")
- Result<PlanTypeEnumOut> getPlanTypeEnum();
-
- @ApiOperation("鑾峰彇褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑涓€涓嬮」鐩粡璐规牳瀹氭暟")
- @PostMapping("/queryQuotaMoney")
- Result<String> queryQuotaMoney(@RequestParam Integer year);
-
- @ApiOperation("鑾峰彇褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑涓€涓嬫棩甯告牳瀹氭暟")
- @PostMapping("/queryRiChangQuotaMoney")
- Result<String> queryRiChangQuotaMoney(@RequestParam Integer year);
-
- /**
- * 椤圭洰搴撳鏍稿畬鎴愮殑杩涘叆涓€涓�
- * */
- @PostMapping("/enterAllProjectPlanType1")
- Result<Object> enterAllProjectPlanType1();
-
- /**
- * 浜屼笂瀹℃牳瀹屾垚鐨勮繘鍏ユ壒澶�
- * */
- @PostMapping("/enterPiFuAllProjectPlan")
- Result<Boolean> enterPiFuAllProjectPlan();
-
- @ApiOperation("14.浜哄憳缁忚垂杩涘叆浜屼笂")
- @PostMapping("/enterPersonProjectPlan")
- Result<Object> enterPersonProjectPlan(Integer year);
-
- /**
- * 鏃ュ父鍏敤缁忚垂杩涘叆浜屼笂
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/enterPublicProjectPlan")
- Result<Object> enterPublicProjectPlan();
-
- /**
- * 鍚屾鏃ュ父鍏敤缁忚垂杩涘叆鎵瑰
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/syncPiFuPublicProjectPlan")
- Result<Object> syncPiFuPublicProjectPlan();
-
- /**
- * 鏃ュ父鍏敤缁忚垂杩涘叆鎵瑰
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/enterPiFuPublicProjectPlan")
- Result<Object> enterPiFuPublicProjectPlan(List<Long> idList);
-
- /**
- * 鏌ヨ椤圭洰搴撳熀鏈睘鎬zy鍗曚釜
- * @param id id
- * @return {@link Result}<{@link ProjectLibraryOut}>
- */
- @PostMapping("/getProjectLibrary")
- Result<ProjectPlanBookOut> getProjectLibrary(Long id);
-
- /**
- * 鏌ヨ椤圭洰搴撳熀鏈睘鎬zy
- * @param qry qry
- * @return {@link Result}<{@link ProjectLibraryOut}>
- */
- @PostMapping("/listProjectLibraryGzy")
- Result<ProjectLibraryOut> listProjectLibraryGzy(@RequestBody ProjectLibraryQry qry);
-
- /**
- * 閮ㄩ棬棰勭畻椤圭洰搴撴煡璇紙鐢虫姤搴撱€佸偍澶囧簱銆佸畬缁撳簱锛�
- * @param qry qry
- * @return {@link Result}<{@link ProjectLibraryOut}>
- */
- @PostMapping("/listProjectLibraryGzyChange")
- Result<ProjectLibraryAndBudgetInfoOut> listProjectLibraryGzyChange(@RequestBody ProjectLibraryQry qry);
-
- /**
- * 瀹岀粨椤圭洰
- * @param idList idList
- * @return {@link Result}<{@link Boolean}>
- */
- @PostMapping("/projectStateSuccess")
- Result<Boolean> projectStateSuccess(List<Long> idList);
-
-
- /**
- * 涓椤圭洰
- * @param idList idList
- * @return {@link Result}<{@link Boolean}>
- */
- @PostMapping("/projectStateBreak")
- Result<Boolean> projectStateBreak(List<Long> idList);
-
- /**
- * 鍦ㄥ缓椤圭洰
- * @param idList idList
- * @return {@link Result}<{@link Boolean}>
- */
- @PostMapping("/projectStateStart")
- Result<Boolean> projectStateStart(List<Long> idList);
-
- /**
- * 鍒濆鍖栭」鐩�
- * @param idList idList
- * @return {@link Result}<{@link Boolean}>
- */
- @PostMapping("/projectStateInit")
- Result<Boolean> projectStateInit(List<Long> idList);
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
index 33a0dbf5c47d302d52f78ea481d88ab25957827d..042f7dd5f79124540ccb39030dd21f2d048ce2a2 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectPlan.java
@@ -1,24 +1,8 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.projectlibrary.ProjectLibraryOut;
-import com.seasky.projectplan.dto.projectlibrary.ProjectStateOut;
-import com.seasky.projectplan.dto.projectplan.*;
-import com.seasky.projectplan.dto.projectplan.projectTypeOut.ProjectPlanStateOut;
-import com.seasky.projectplan.dto.projectplan.projectTypeOut.ProjectTypeOut;
-import com.seasky.projectplan.dto.projectplan.projectTypeOut.ProjectTypeQry;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
/**
* 椤圭洰璁″垝鐢虫姤涔PI
@@ -31,421 +15,4 @@ import java.util.List;
@Validated
public interface IProjectPlan {
- /**
- * 鏍规嵁鐢虫姤闃舵鏌ヨ椤圭洰绫诲瀷
- * @param projectInfoPlanQry 椤圭洰淇℃伅璁″垝qry
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @PostMapping(path = "/queryProjectTypeByPlanType")
- Result<ProjectTypeOut> queryProjectTypeByPlanType(ProjectTypeQry projectInfoPlanQry);
-
- /**
- * 淇濆瓨椤圭洰缁忚垂鐢虫姤涔�
- * @param projectPlanBookCmd 椤圭洰淇℃伅璁″垝cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveProjectInfoPlan")
- Result<Long> saveProjectInfoPlan(ProjectPlanBookCmd projectPlanBookCmd);
-
- /**
- * 淇濆瓨鏃ュ父缁忚垂鐢虫姤涔�
- *
- * @param projectPlanBookCmd 椤圭洰瑙勫垝涔md
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveProjectDailyPlan")
- Result<Long> saveProjectDailyPlan(ProjectPlanBookCmd projectPlanBookCmd);
-
- /**
- * 淇濆瓨浜哄憳缁忚垂鐢虫姤涔�
- *
- * @param projectPlanBookCmd 椤圭洰瑙勫垝涔md
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveProjectPersonPlan")
- Result<Long> saveProjectPersonPlan(ProjectPlanBookCmd projectPlanBookCmd);
-
- /**
- * 鍒犻櫎椤圭洰缁忚垂鐢虫姤涔�
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeProjectInfoPlan")
- Result<Integer> removeProjectInfoPlan(List<Long> ids);
-
- /**
- * 鍒犻櫎鏃ュ父缁忚垂鐢虫姤涔�
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeProjectDailyPlan")
- Result<Integer> removeProjectDailyPlan(List<Long> ids);
-
- /**
- * 鍒犻櫎浜哄憳缁忚垂鐢虫姤涔�
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeProjectPersonPlan")
- Result<Integer> removeProjectPersonPlan(List<Long> ids);
-
-
- /**
- * 鎻愪氦椤圭洰鐢虫姤涔�
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/submitProjectPlan")
- Result<Integer> submitProjectPlan(ActionFlowCmd actionFlowCmd);
-
- /**
- * 閫€鍥為」鐩敵鎶ヤ功
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/rollBackProjectPlan")
- Result<Integer> rollBackProjectPlan(ActionFlowCmd actionFlowCmd);
-
-
- /**
- * 閲嶆柊璋冪敤椤圭洰璁″垝
- *
- * @param id id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/reCallProjectPlan")
- Result<Integer> reCallProjectPlan(Long id);
-
- /**
- * 鎵归噺鎻愪氦椤圭洰鐢虫姤涔�
- *
- * @param actionFlowCmdList 鍔ㄤ綔娴乧md鍒楄〃
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/submitProjectPlanList")
- Result<Integer> submitProjectPlanList(List<ActionFlowCmd> actionFlowCmdList);
-
- /**
- * 鎵归噺閫€鍥為」鐩敵鎶ヤ功
- *
- * @param actionFlowCmdList 鍔ㄤ綔娴乧md鍒楄〃
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/rollBackProjectPlanList")
- Result<Integer> rollBackProjectPlanList(List<ActionFlowCmd> actionFlowCmdList);
-
-
- /**
- * 鎻愪氦椤圭洰鐢虫姤涔﹁嚦瀹屾垚
- *
- * @param idList 鍒楄〃
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/submitProjectPlanListToFinish")
- Result<Integer> submitProjectPlanListToFinish(@RequestBody List<Long> idList);
-
- //浠ヤ笅 Q绾�
-
- /**
- * 鏍规嵁ID 鑾峰彇椤圭洰缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�)
- *
- * @param id id
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectInfoPlanById")
- Result<ProjectPlanBookOut> queryProjectInfoPlanById(Long id);
-
-
- /**
- * 鏌ヨ鍘嗗彶椤圭洰璁″垝涔�
- * @param projectInfoPlanQry 椤圭洰淇℃伅璁″垝qry
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @PostMapping(path = "/queryHistoryProjectPlanBook")
- Result<ProjectPlanBookOut> queryHistoryProjectPlanBook(ProjectInfoPlanQry projectInfoPlanQry);
-
-
- /**
- * 鏍规嵁ID 鑾峰彇鏃ュ父缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�)
- *
- * @param id id
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectDailyPlanById")
- Result<ProjectPlanBookOut> queryProjectDailyPlanById(Long id);
-
- /**
- * 鏍规嵁ID 鑾峰彇浜哄憳缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�)
- *
- * @param id id
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectPersonPlanById")
- Result<ProjectPlanBookOut> queryProjectPersonPlanById(Long id);
-
- /**
- * 閮ㄩ棬棰嗗瀹℃壒 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栭」鐩粡璐归泦鍚堬紙鍒嗛〉锛�
- *
- * @param projectInfoPlanQry 椤圭洰璁″垝涔﹀叆鍙俀ry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectInfoPlanPageByCurrentUserDept")
- Result<ProjectPlanBookOut> queryProjectInfoPlanPageByCurrentUserDept(ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鍒嗙鏍￠瀵煎鎵� 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栭」鐩粡璐归泦鍚堬紙鍒嗛〉锛�
- *
- * @param projectInfoPlanQry 椤圭洰璁″垝涔﹀叆鍙俀ry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectInfoPlanPageByCurrentUserRelevantDept")
- Result<ProjectPlanBookOut> queryProjectInfoPlanPageByCurrentUserRelevantDept(ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栨棩甯哥粡璐归泦鍚堬紙鍒嗛〉锛�
- *
- * @param projectDailyPlanQry 椤圭洰姣忓ぉ璁″垝鍏ュ弬Qry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectDailyPlanByCurrentUserDept")
- Result<ProjectPlanBookOut> queryProjectDailyPlanByCurrentUserDept(ProjectDailyPlanQry projectDailyPlanQry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栦汉鍛樼粡璐归泦鍚堬紙鍒嗛〉锛�
- *
- * @param projectPersonPlanQry 椤圭洰浜鸿鍒掑叆鍙俀ry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectPersonPlanByCurrentUserDept")
- Result<ProjectPlanBookOut> queryProjectPersonPlanByCurrentUserDept(ProjectPersonPlanQry projectPersonPlanQry);
-
- /**
- * 鏍规嵁椤圭洰绫诲瀷鑾峰彇璇ョ被鍨嬬殑鎵€鏈夐」鐩�(鍒嗛〉)
- *
- * @param projectInfoPlanQry 椤圭洰璁″垝涔﹀叆鍙俀ry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectInfoPlanPageByProjectType")
- Result<ProjectPlanBookOut> queryProjectInfoPlanPageByProjectType(ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄧ殑閮ㄩ棬闆嗗悎鎵€鎷ユ湁鐨勯」鐩被鍨嬫墍鏈夐」鐩俊鎭�
- *
- * @param projectInfoPlanQry 椤圭洰璁″垝涔﹀叆鍙俀ry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectInfoPlanPageByOwnCurrentUserDept")
- Result<ProjectPlanBookOut> queryProjectInfoPlanPageByOwnCurrentUserDept(ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 璐㈠姟澶勫鎵� 鑾峰彇椤圭洰缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�
- *
- * @param projectInfoPlanQry 椤圭洰淇℃伅璁″垝qry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectInfoPlanPage")
- Result<ProjectPlanBookOut> queryProjectInfoPlanPage(ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鍙戣澶勫鎵� 鑾峰彇椤圭洰缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�
- * @param projectInfoPlanQry 椤圭洰淇℃伅璁″垝qry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryRegulatoryProjectInfoPlanPage")
- Result<ProjectPlanBookOut> queryRegulatoryProjectInfoPlanPage(ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鑾峰彇鏃ュ父缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�
- *
- * @param projectDailyPlanQry 椤圭洰姣忓ぉ璁″垝鍏ュ弬Qry
- * @return {@link Result<ProjectPlanBookOut>}
- */
- @PostMapping(path = "/queryProjectDailyPlan")
- Result<ProjectPlanBookOut> queryProjectDailyPlan(ProjectDailyPlanQry projectDailyPlanQry);
-
- /**
- * 鏍规嵁浼犲叆閮ㄩ棬鑾峰彇鏌ヨ瀹氶鍩虹淇℃伅
- *
- * @return {@link Result<PlanBookBasicInformationOut>}
- */
- @PostMapping(path = "/queryBasicInformation")
- Result<PlanBookBasicInformationOut> queryBasicInformation(PlanBookBasicInformationQry planBookBasicInformationQry);
-
- /**
- * 瀵煎嚭鏃ュ父鐢虫姤涔�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectDailyPlanQry 椤圭洰鏃ュ父璁″垝qry
- */
- @PostMapping(path = "/exportProjectPlan")
- void exportProjectPlan(HttpServletRequest request, HttpServletResponse response, ProjectDailyPlanQry projectDailyPlanQry);
-
- /**
- * 瀵煎嚭椤圭洰鐢虫姤涔�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectInfoPlanQry 椤圭洰鏃ュ父璁″垝qry
- */
- @PostMapping(path = "/exportInfoProjectPlan")
- void exportInfoProjectPlan(HttpServletRequest request, HttpServletResponse response, ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堝鍑洪」鐩敵鎶ヤ功
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectInfoPlanQry 椤圭洰淇℃伅璁″垝qry
- */
- @PostMapping(path = "/exportInfoProjectPlanByCurrentUserDept")
- void exportInfoProjectPlanByCurrentUserDept(HttpServletRequest request, HttpServletResponse response, ProjectInfoPlanQry projectInfoPlanQry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堝鍑轰汉鍛樼敵鎶ヤ功
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectPersonPlanQry 椤圭洰淇℃伅璁″垝qry
- */
- @PostMapping(path = "/exportPersonProjectPlanByCurrentUserDept")
- void exportPersonProjectPlanByCurrentUserDept(HttpServletRequest request, HttpServletResponse response, ProjectPersonPlanQry projectPersonPlanQry);
-
-
- /**
- * 涓嬭浇椤圭洰鐢虫姤涔﹀鍏ユā鏉�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @PostMapping(path = "/downLoadInfoTemplate")
- void downLoadInfoTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎叆椤圭洰鐢虫姤涔�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importInfoPlan")
- Result<Object> importInfoPlan(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 澶嶅埗鍘嗗彶鍏叡椤圭洰
- *
- * @param id id
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/copyHistoryPublicProject")
- Result<Object> copyHistoryPublicProject(Long id);
-
- /**
- * 鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂ㄧ殑鍘嗗彶鍏敤缁忚垂
- *
- * @param qry qry
- * @return {@link Result<ProjectLibraryOut>}
- */
- @PostMapping(path = "/queryHistoryPublicPageByCurrentUserDept")
- Result<PublicProjectHisOut> queryHistoryPublicPageByCurrentUserDept(PublicHisQry qry);
-
- /**
- * 寮哄埗娴佺▼閲嶅惎锛堜笉閬楃暀鍘嗗彶瀹℃壒璁板綍锛�
- *
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initProjectPlanFlow")
- Result<Integer> initProjectPlanFlow(List<Long> ids);
-
-
- /**
- * 鍏宠仈缁忚垂鍗″彿鏌ヨ
- * @param projectPlanBooksCmd projectPlanBooksCmds
- * @return {@link Result}<{@link Integer}>
- */
- @PostMapping(path = "/queryProjectPlanBook")
- Result<ProjectPlanBooksOut> queryProjectPlanBook(ProjectPlanBooksCmd projectPlanBooksCmd);
-
-
- /**
- * 淇濆瓨缁忚垂鍗″彿
- *
- * @param expenseCard 鍗¤垂鐢�
- * @return {@link Result}<{@link ProjectPlanBooksOut}>
- */
- @PostMapping(path = "/saveExpenseCardNumber")
- @Validated({ExpenseCardCmd.SaveExpenseCardCmdInterface.class})
- Result<Object> saveExpenseCardNumber(@Valid ExpenseCardCmd expenseCard);
-
- /**
- * init閰嶉淇℃伅
- *
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initQuotaInfo")
- Result<Integer> initQuotaInfo();
-
-
- /**
- * 鍑哄彛
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectPlanBooksCmd 椤圭洰瑙勫垝涔md
- */
- @PostMapping(path = "/export")
- Result<Object> export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd);
-
-
- /**
- * 涓婚鍒楄〃
- *
- * @param subjectCmdList cmd涓婚鍒楄〃
- * @return {@link Result}<{@link SubjectOut}>
- */
- @PostMapping(path = "/queryPayNameAndMoneyByProjectCode")
- Result<SubjectOut> queryPayNameAndMoneyByProjectCode(List<SubjectCmd> subjectCmdList);
-
-
- /**
- * 鍚屾涓€涓婄淮鎸佹€х粡璐瑰埌浜屼笂
- *
- * @param year 骞翠唤
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/syncOneUpPerson")
- Result<Object> syncOneUpPersonnelExpenditureToTwoUp(@RequestParam Integer year);
-
- /**
- * 瀵煎嚭浜哄憳缁忚垂
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportPersonFund")
- Result<Object> exportPersonFund(HttpServletRequest request,HttpServletResponse response,ProjectPersonPlanQry projectPersonPlanQry);
-
- /**
- * 鏌ヨ鐢虫姤涔︽墍鏈夌姸鎬�
- *
- * @return {@link Result}<{@link ProjectPlanStateOut}>
- */
- @PostMapping(path = "/queryProjectPlanStateOut")
- Result<ProjectPlanStateOut> queryProjectPlanStateOut();
-
- /**
- * 鑾峰彇鎵€鏈夌粡璐瑰崱鍙�
- *
- * @return {@link Result}<{@link FundCodeOut}>
- */
- @PostMapping(path = "/getFundCodeList")
- Result<FundCodeOut> getFundCodeList();
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectTarget.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectTarget.java
index 0ed750043062a631d49e7f39f2b6dd09e83bcf1f..43c9b16f96224c5ae10b52734a4be25f147cacaf 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectTarget.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IProjectTarget.java
@@ -1,20 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.projecttarget.ProjectTargetCmd;
-import com.seasky.projectplan.dto.projecttarget.ProjectTargetOut;
-import com.seasky.projectplan.dto.projecttarget.ProjectTargetQry;
-import com.seasky.projectplan.dto.projecttarget.ProjectTargetTreeOut;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* 缁╂晥鎸囨爣API
@@ -26,120 +13,4 @@ import java.util.List;
@RequestMapping("projectTarget")
public interface IProjectTarget {
- /**
- * 淇濆瓨椤圭洰鎸囨爣缁╂晥
- * @param projectTargetCmd 椤圭洰鐩爣cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveProjectTarget")
- Result<Long> saveProjectTarget(ProjectTargetCmd projectTargetCmd);
-
- /**
- * 鍒犻櫎鎸囨爣缁╂晥
- * @param ids id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeProjectTarget")
- Result<Integer> removeProjectTarget(List<Long> ids);
-
- /**
- * 鍒犻櫎鎸囨爣缁╂晥搴�
- * @param id id
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/removeProjectTargetStore")
- Result<Integer> removeProjectTargetStore(Long id);
-
- /**
- * 鍚屾涓婂勾鐨勭哗鏁堝簱
- * @param projectTargetCmd 椤圭洰鐩爣cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initProjectTargetList")
- Result<Integer> initProjectTargetList(ProjectTargetCmd projectTargetCmd);
-
- /**
- * 瀵煎叆缁╂晥绠＄悊
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @PostMapping(path = "/importProjectTarget")
- Result<Object> importProjectTarget(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎叆缁╂晥绠＄悊妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importProjectTargetTemplate")
- Result<Object> importProjectTargetTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎嚭缁╂晥绠＄悊
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param parent 鐖�
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportProjectTarget")
- Result<Object> exportProjectTarget(HttpServletRequest request, HttpServletResponse response, @RequestParam("parent")Long parent);
-
- //浠ヤ笅 Q绾�
-
- /**
- * 鏌ヨ缁╂晥鎸囨爣鏄庣粏
- *
- * @param id id
- * @return {@link Result<ProjectTargetOut>}
- */
- @PostMapping(path = "/queryProjectTarget")
- Result<ProjectTargetOut> queryProjectTargetById(Long id);
-
- /**
- * 鏌ヨ缁╂晥鎸囨爣鏍�
- *
- * @param projectTargetQry 椤圭洰鐩爣鍏ュ弬Qry
- * @return {@link Result<ProjectTargetTreeOut>}
- */
- @PostMapping("queryProjectTargetTree")
- Result<ProjectTargetTreeOut> queryProjectTargetListTree(ProjectTargetQry projectTargetQry);
-
- /**
- * 鏌ヨ缁╂晥搴撲笅鎷夋
- * @param projectTargetQry 椤圭洰鐩爣鍏ュ弬Qry
- * @return {@link Result<ProjectTargetTreeOut>}
- */
- @PostMapping("queryProjectTargetOneList")
- Result<ProjectTargetOut> queryProjectTargetOneList(ProjectTargetQry projectTargetQry);
-
- /**
- * 鏍规嵁鎸囨爣缁╂晥搴搃d鑾峰彇鎸囨爣缁╂晥搴撳彾瀛愯妭鐐筰d闆嗗悎
- * @param projectTargetQry 椤圭洰鐩爣鍏ュ弬Qry
- * @return {@link Result<ProjectTargetTreeOut>}
- */
- @PostMapping("queryLeafNodeById")
- Result<Long> queryLeafNodeById(ProjectTargetQry projectTargetQry);
-
- /**
- * 閫氳繃鐖惰妭鐐筰d 鍒嗛〉 鏌ヨ缁╂晥鎸囨爣
- * @param projectTargetQry 椤圭洰鐩爣鍏ュ弬Qry
- * @return {@link Result<ProjectTargetOut>}
- */
- @PostMapping(path = "/queryProjectTargetPageByPId")
- Result<ProjectTargetOut> queryProjectTargetPageByParentNodeId(ProjectTargetQry projectTargetQry);
-
- /**
- * 浠庝簩绾у紑濮嬫煡璇㈢哗鏁堟寚鏍囨爲
- * @param projectTargetQry 椤圭洰鐩爣qry
- * @return {@link Result<ProjectTargetTreeOut>}
- */
- @PostMapping(path = "/querySecondProjectTargetListTree")
- Result<ProjectTargetTreeOut> querySecondProjectTargetListTree(@RequestBody ProjectTargetQry projectTargetQry);
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPublicInfoController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPublicInfoController.java
index 546a9d627873ded380ce432ee73f139aff52d534..bca66fe89d8a5a6d3671496e6874d41bf12a70de 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPublicInfoController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IPublicInfoController.java
@@ -1,51 +1,7 @@
package com.seasky.projectplan.api;
-import com.seasky.core.common.Pagination;
-import com.seasky.core.common.Result;
-import com.seasky.projectplan.dto.Coefficient.CoefficientCmd;
-import com.seasky.projectplan.dto.Coefficient.CoefficientOut;
-import com.seasky.projectplan.dto.Coefficient.CoefficientQry;
-import com.seasky.projectplan.dto.FacultyStaff.FacultyStaffCmd;
-import com.seasky.projectplan.dto.FacultyStaff.FacultyStaffOut;
-import com.seasky.projectplan.dto.FacultyStaff.FacultyStaffQry;
-import com.seasky.projectplan.dto.Plea.PleaCmd;
-import com.seasky.projectplan.dto.Plea.PleaOut;
-import com.seasky.projectplan.dto.Plea.PleaQry;
-import com.seasky.projectplan.dto.SpecialFunds.SpecialFundsCmd;
-import com.seasky.projectplan.dto.SpecialFunds.SpecialFundsOut;
-import com.seasky.projectplan.dto.SpecialFunds.SpecialFundsQry;
-import com.seasky.projectplan.dto.collegeclasses.CollegeClassesCmd;
-import com.seasky.projectplan.dto.collegeclasses.CollegeClassesOut;
-import com.seasky.projectplan.dto.collegeclasses.CollegeClassesQry;
-import com.seasky.projectplan.dto.explain.ExplainCmd;
-import com.seasky.projectplan.dto.explain.ExplainOut;
-import com.seasky.projectplan.dto.explain.ExplainQry;
-import com.seasky.projectplan.dto.fundingstandard.FundingStandardCmd;
-import com.seasky.projectplan.dto.fundingstandard.FundingStandardOut;
-import com.seasky.projectplan.dto.fundingstandard.FundingStandardQry;
-import com.seasky.projectplan.dto.incomeplan.InComePlanCmd;
-import com.seasky.projectplan.dto.incomeplan.InComePlanOut;
-import com.seasky.projectplan.dto.incomeplan.IncomeplanQry;
-import com.seasky.projectplan.dto.peopleInformation.PeopleInformationCmd;
-import com.seasky.projectplan.dto.peopleInformation.PeopleInformationOut;
-import com.seasky.projectplan.dto.peopleInformation.PeopleInformationQry;
-import com.seasky.projectplan.dto.projecttarget.ProjectTargetCmd;
-import com.seasky.projectplan.dto.publicCourseInformation.PublicCourseInformationCmd;
-import com.seasky.projectplan.dto.publicCourseInformation.PublicCourseInformationOut;
-import com.seasky.projectplan.dto.publicCourseInformation.PublicCourseInformationQry;
-import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentInformationCmd;
-import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentInformationOut;
-import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentInformationQry;
-import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentOut;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* ipublic淇℃伅鎺у埗鍣�
@@ -57,372 +13,4 @@ import java.util.List;
@RequestMapping("publicInfo")
public interface IPublicInfoController {
- /**
- * 淇濆瓨鐢熷潎瀹氶
- * @param cmd 鐢熷潎瀹氶cmd
- * @return {@link Long}
- */
- @PostMapping(path = "/saveCollegeClasses")
- Result<Long> saveCollegeClasses(CollegeClassesCmd cmd);
-
- /**
- * 鍒犻櫎鐢熷潎瀹氶
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removeCollegeClasses")
- Result<Long> removeCollegeClasses(List<Long> ids);
-
- /**
- * 鑾峰彇鐢熷潎瀹氶甯﹀垎椤�
- * @param qry qry
- * @return {@link Pagination < CollegeClassesOut >}
- */
- @PostMapping(path = "/queryCollegeClasses")
- Result<CollegeClassesOut> queryCollegeClasses(CollegeClassesQry qry);
-
- /**
- * 淇濆瓨浜哄憳淇℃伅(淇濆瓨鏁欒亴宸ヤ汉淇℃伅)
- * @param cmd 浜哄憳淇℃伅cmd
- * @return {@link Long}
- */
- @PostMapping(path = "/savePeopleInformation")
- Result<Long> savePeopleInformation(PeopleInformationCmd cmd);
-
- /**
- * 鍒犻櫎浜哄憳淇℃伅(鍒犻櫎鏁欒亴宸ヤ汉淇℃伅)
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removePeopleInformation")
- Result<Long> removePeopleInformation(List<Long> ids);
-
- /**
- * 浜哄憳淇℃伅甯﹀垎椤�(鏄剧ず鎵€鏈変汉鏁欒亴宸ヤ汉淇℃伅甯﹀垎椤�)
- * @param qry qry
- * @return {@link Pagination < PeopleInformationOut >}
- */
- @PostMapping(path = "/queryPeopleInformation")
- Result<PeopleInformationOut> queryPeopleInformation(@RequestBody PeopleInformationQry qry);
-
- /**
- * 瀵煎叆-浜哄憳淇℃伅锛堜汉浜嬪锛�-妯℃澘涓嬭浇
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importPeopleInformationTemplate")
- Result<Object> importPeopleInformationTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎叆-浜哄憳淇℃伅锛堜汉浜嬪锛�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importPeopleInformation")
- Result<Object> importPeopleInformation(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎嚭-浜哄憳淇℃伅锛堜汉浜嬪锛�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportPeopleInformation")
- Result<Object> exportPeopleInformation(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 淇濆瓨鍦ㄦ牎瀛︾敓淇℃伅
- * @param cmd 鍦ㄦ牎瀛︾敓淇℃伅cmd
- * @return {@link Long}s
- */
- @PostMapping(path = "/saveSchoolStudentInformation")
- Result<Long> saveSchoolStudentInformation(SchoolStudentInformationCmd cmd);
-
- /**
- * 鍒犻櫎鍦ㄦ牎瀛︾敓淇℃伅
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removeSchoolStudentInformation")
- Result<Long> removeSchoolStudentInformation(List<Long> ids);
-
- /**
- * 鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤�(鏄剧ず鍦ㄦ牎瀛︾敓淇℃伅)
- * @param qry qry
- * @return {@link Pagination < SchoolStudentInformationOut >}
- */
- @PostMapping(path = "/querySchoolStudentInformation")
- Result<SchoolStudentOut> querySchoolStudentInformation(@RequestBody SchoolStudentInformationQry qry);
-
- /**
- * 瀵煎叆-鍦ㄦ牎瀛︾敓淇℃伅-妯℃澘涓嬭浇
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importSchoolStudentTemplate")
- Result<Object> importSchoolStudentTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎叆-鍦ㄦ牎瀛︾敓淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importSchoolStudent")
- Result<Object> importSchoolStudent(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎嚭-鍦ㄦ牎瀛︾敓淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param qry qry
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportSchoolStudent")
- Result<Object> exportSchoolStudent(HttpServletRequest request, HttpServletResponse response, @RequestBody SchoolStudentInformationQry qry);
- /**
- * 淇濆瓨鍏叡璇句俊鎭紙寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛夛級
- * @param cmd 鍏叡璇句俊鎭痗md
- * @return {@link Long}
- */
- @PostMapping(path = "/savePublicCourseInformation")
- Result<Long> savePublicCourseInformation(PublicCourseInformationCmd cmd);
-
- /**
- * 鍒犻櫎鍏叡璇句俊鎭紙寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛夛級
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removePublicCourseInformation")
- Result<Long> removePublicCourseInformation(List<Long> ids);
-
- /**
- * 鍏叡璇句俊鎭甫鍒嗛〉锛堝紑璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛夛級
- * @param qry qry
- * @return {@link Pagination < PeopleInformationOut >}
- */
- @PostMapping(path = "/queryPublicCourseInformation")
- Result<PublicCourseInformationOut> queryPublicCourseInformation(@RequestBody PublicCourseInformationQry qry);
-
- /**
- * 瀵煎叆-鍏叡璇句俊鎭紙鏁欏姟澶勶級-妯℃澘涓嬭浇
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importEducationalTemplate")
- Result<Object> importEducationalTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎叆-鍏叡璇句俊鎭紙鏁欏姟澶勶級
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importEducational")
- Result<Object> importEducational(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎嚭-鍏叡璇句俊鎭紙鏁欏姟澶勶級
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportEducational")
- Result<Object> exportEducational(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 淇濆瓨闃垮疂绯绘暟
- * @param cmd 闃垮疂绯绘暟cmd
- * @return {@link Long}
- */
- @PostMapping(path = "/saveCoefficient")
- Result<Long> saveCoefficient(CoefficientCmd cmd);
-
- /**
- * 鍒犻櫎闃垮疂绯绘暟
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removeCoefficient")
- Result<Long> removeCoefficient(List<Long> ids);
-
- /**
- * 闃垮疂绯绘暟甯﹀垎椤�
- * @param qry qry
- * @return {@link Pagination < CoefficientOut >}
- */
- @PostMapping(path = "/queryCoefficient")
- Result<CoefficientOut> queryCoefficient(@RequestBody CoefficientQry qry);
-
- /**
- * 淇濆瓨鏁欒亴宸ヤ汉鍧�
- * @param cmd 鏁欒亴宸ヤ汉鍧嘽md
- * @return {@link Long}
- */
- @PostMapping(path = "/saveFacultyStaff")
- Result<Long> saveFacultyStaff(FacultyStaffCmd cmd);
-
- /**
- * 鍒犻櫎鏁欒亴宸ヤ汉鍧�
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removeFacultyStaff")
- Result<Long> removeFacultyStaff(List<Long> ids);
-
- /**
- * 鏁欒亴宸ヤ汉鍧囧甫鍒嗛〉
- * @param qry qry
- * @return {@link Pagination < FacultyStaffOut >}
- */
- @PostMapping(path = "/queryFacultyStaff")
- Result<FacultyStaffOut> queryFacultyStaff(@RequestBody FacultyStaffQry qry);
-
- /**
- * 淇濆瓨閮ㄩ棬鐗规畩缁忚垂
- * @param cmd 閮ㄩ棬鐗规畩缁忚垂cmd
- * @return {@link Long}
- */
- @PostMapping(path = "/saveSpecialFunds")
- Result<Long> saveSpecialFunds(SpecialFundsCmd cmd);
-
- /**
- * 鍒犻櫎閮ㄩ棬鐗规畩缁忚垂
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removeSpecialFunds")
- Result<Long> removeSpecialFunds(List<Long> ids);
-
- /**
- * 閮ㄩ棬鐗规畩缁忚垂甯﹀垎椤�
- * @param qry qry
- * @return {@link Pagination < SpecialFundsOut >}
- */
- @PostMapping(path = "/querySpecialFunds")
- Result<SpecialFundsOut> querySpecialFunds(@RequestBody SpecialFundsQry qry);
-
- /**
- * 淇濆瓨绛旇京璐�
- * @param cmd 绛旇京璐筩md
- * @return {@link Long}
- */
- @PostMapping(path = "/savePlea")
- Result<Long> savePlea(PleaCmd cmd);
-
- /**
- * 鍒犻櫎绛旇京璐�
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
- @PostMapping(path = "/removePlea")
- Result<Long> removePlea(List<Long> ids);
-
- /**
- * 绛旇京璐瑰甫鍒嗛〉
- * @param qry qry
- * @return {@link Pagination < PleaOut >}
- */
- @PostMapping(path = "/queryPlea")
- Result<PleaOut> queryPlea(@RequestBody PleaQry qry);
-
-
-
-
-
-
-
- /**
- * 淇濆瓨鑷畾涔夋爣鍑�
- *
- * @param cmd cmd
- * @return {@link Result}<{@link Long}>
- */
- @PostMapping(path = "/saveFundingStandard")
- Result<Long> saveFundingStandard(FundingStandardCmd cmd);
-
- /**
- * 鍒犻櫎鑷畾涔夋爣鍑�
- *
- * @param ids id
- * @return {@link Result}<{@link Long}>
- */
- @PostMapping(path = "/removeFundingStandard")
- Result<Long> removeFundingStandard(List<Long> ids);
-
- /**
- * 鏌ヨ鑷畾涔夋爣鍑�
- *
- * @param qry qry
- * @return {@link Result}<{@link FundingStandardOut}>
- */
- @PostMapping(path = "/queryFundingStandard")
- Result<FundingStandardOut> queryFundingStandard(FundingStandardQry qry);
-
- /**
- * 淇濆瓨璇存槑
- *
- * @param cmd cmd
- * @return {@link Result}<{@link Long}>
- */
- @PostMapping(path = "/saveExplain")
- Result<Long> saveExplain(ExplainCmd cmd);
-
- /**
- * 瀵煎叆-鑷畾涔夋爣鍑�-妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importFundingStandardTemplate")
- Result<Object> importFundingStandardTemplate(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 瀵煎叆-鑷畾涔夋爣鍑�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/importFundingStandard")
- Result<Object> importFundingStandard(HttpServletRequest request, HttpServletResponse response, MultipartFile file);
-
- /**
- * 瀵煎嚭-鑷畾涔夋爣鍑�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/exportFundingStandard")
- Result<Object> exportFundingStandard(HttpServletRequest request, HttpServletResponse response);
-
- /**
- * 璐㈠姟纭
- *
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping(path = "/financeConfirm")
- Result<Object> financeConfirm();
-
-
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IQuotaManage.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IQuotaManage.java
index 100452cb000e482d4faf31a179a5d189e5611e83..388dd59c1f858ad0fee5976946cf61c6466217d4 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IQuotaManage.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/IQuotaManage.java
@@ -23,229 +23,4 @@ import java.util.List;
@RequestMapping("quotaManage")
@Validated
public interface IQuotaManage {
-
- /**
- * 鍒濆鍖栭」鐩被鍨嬪畾棰�
- *
- * @param cmd cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initProjectType")
- Result<Integer> initProjectType(QuotaManageCmd cmd);
-
- /**
- * 鍒濆鍖栭儴闂� 鏃ュ父缁忚垂瀹氶
- *
- * @param cmd cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initProjectDeptDaily")
- Result<Integer> initProjectDeptDaily(QuotaManageCmd cmd);
-
- /**
- * 鍒濆鍖栭儴闂� 椤圭洰缁忚垂瀹氶
- *
- * @param cmd cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initProjectDeptProject")
- Result<Integer> initProjectDeptProject(QuotaManageCmd cmd);
-
- /**
- * 鍒濆鍖栭」鐩畾棰�
- *
- * @param cmd cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initProject")
- Result<Integer> initProject(QuotaManageCmd cmd);
-
- /**
- * 鍒濆鍖栦簩涓嬮」鐩畾棰�
- * @param cmd cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/initErXiaProject")
- Result<Integer> initErXiaProject(QuotaManageCmd cmd);
-
- /**
- * 淇敼椤圭洰绫诲瀷瀹氶鐨勯噾棰�
- *
- * @param cmd cmd
- * @return {@link Integer}
- */
- @PostMapping(path = "/saveProjectTypeMoney")
- Result<Integer> saveProjectTypeMoney(QuotaManageCmd cmd);
-
- /**
- * 淇敼閮ㄩ棬瀹氶鐨勯噾棰�
- *
- * @param cmd cmd
- * @return {@link Integer}
- */
- @PostMapping(path = "/saveProjectDeptMoney")
- Result<Integer> saveProjectDeptMoney(QuotaManageCmd cmd);
-
- /**
- * 淇敼浜屼笅椤圭洰瀹氶閲戦
- *
- * @param cmd cmd
- * @return {@link Integer}
- */
- @PostMapping(path = "/saveErXiaProjectMoney")
- Result<Integer> saveErXiaProjectMoney(QuotaManageCmd cmd);
-
- /**
- * 淇敼鍏蜂綋椤圭洰瀹氶鐨勯噾棰�
- *
- * @param cmd cmd
- * @return {@link Integer}
- */
- @PostMapping(path = "/saveProjectMoney")
- @Validated({QuotaManageCmd.SaveQuotaManageCmdInterface.class})
- Result<Integer> saveProjectMoney(@Valid QuotaManageCmd cmd);
-
-
- //浠ヤ笅 Q绾�
-
- /**
- * 鏌ヨ椤圭洰绫诲瀷瀹氶淇℃伅甯﹀垎椤�
- *
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryProjectTypeQuotaPage")
- Result<QuotaManageOut> queryProjectTypeQuotaPage(QuotaManageQry qry);
-
- /**
- * 鏌ヨ閮ㄩ棬鏃ュ父缁忚垂瀹氶甯﹀垎椤�
- *
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryDeptQuotaDailyPage")
- Result<QuotaManageOut> queryDeptQuotaDailyPage(QuotaManageQry qry);
-
- /**
- * 鏌ヨ閮ㄩ棬椤圭洰缁忚垂瀹氶甯﹀垎椤�
- *
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryDeptQuotaProjectPage")
- Result<QuotaManageOut> queryDeptQuotaProjectPage(QuotaManageQry qry);
-
- /**
- * 鏌ヨ鍏蜂綋椤圭洰瀹氶淇℃伅甯﹀垎椤�
- *
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryProjectQuotaPage")
- Result<QuotaManageOut> queryProjectQuotaPage(QuotaManageQry qry);
-
- /**
- * 鏌ヨ浜屼笅椤圭洰瀹氶淇℃伅甯﹀垎椤�
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryErXiaProjectQuotaPage")
- Result<QuotaManageOut> queryErXiaProjectQuotaPage(QuotaManageQry qry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鎵€鍦ㄩ儴闂ㄦ樉绀烘棩甯哥粡璐瑰畾棰濅俊鎭�
- *
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryDeptQuotaDailyByCurrentUserDept")
- Result<QuotaManageOut> queryDeptQuotaDailyByCurrentUserDept(QuotaManageQry qry);
-
- /**
- * 鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鎵€鍦ㄩ儴闂ㄦ樉绀洪」鐩粡璐瑰畾棰濅俊鎭�
- *
- * @param qry 鍏ュ弬Qry
- * @return {@link Result<QuotaManageOut>}
- */
- @PostMapping(path = "/queryDeptQuotaProjectByCurrentUserDept")
- Result<QuotaManageOut> queryDeptQuotaProjectByCurrentUserDept(QuotaManageQry qry);
-
-
- /**
- * 鏌ヨ閰嶉绠＄悊鍒楄〃
- *
- * @param qry qry
- * @return {@link Result<ToQuotaListOut>}
- */
- @PostMapping(path = "/queryToQuotaManageList")
- Result<ToQuotaListOut> queryToQuotaManageList(ToQuotaListQry qry);
-
- /**
- * 鏌ヨ鍗曚釜閰嶉绠＄悊
- *
- * @param id id
- * @return {@link Result<ToQuotaManageOut>}
- */
- @PostMapping(path = "/queryToQuotaManage")
- Result<ToQuotaManageOut> queryToQuotaManage(Long id);
-
-
- /**
- * 鏌ヨ鈥濆彲浠ヤ娇鐢ㄩ」鐩�
- *
- * @param qry qry
- * @return {@link Result<ToQuotaMoneyManageCmd>}
- */
- @PostMapping(path = "/queryQuotCanUseProject")
- Result<ToQuotaMoneyManageCmd> queryQuotCanUseProject(ToQuotaListQry qry);
-
-
- /**
- * 淇濆瓨閰嶉绠＄悊
- *
- * @param toQuotaManageCmd 閰嶉绠＄悊cmd
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/saveQuotaManage")
- Result<Integer> saveQuotaManage(ToQuotaManageCmd toQuotaManageCmd);
-
-
- /**
- * 淇敼闄愰鐨勯挶
- *
- * @param id id
- * @param money 閽�
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/modifyQuotaMoney")
- Result<Integer> modifyQuotaMoney(Long id, BigDecimal money);
-
-
- /**
- * 鏌ヨ閰嶉褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄥ彲鐪嬪埌鐨勫垎閰嶄俊鎭�
- *
- * @param qry qry
- * @return {@link Result<ToQuotaDeptOut>}
- */
- @PostMapping(path = "/queryToQuotaDeptByCurUserDept")
- Result<ToQuotaDeptOut> queryToQuotaDeptByCurUserDept(ToQuotaListQry qry);
-
- /**
- * 鏌ヨ閰嶉閫氳繃id
- *
- * @param id id
- * @return {@link Result<ToQuotaDeptOut>}
- */
- @PostMapping(path = "/queryToQuotaMoneyById")
- Result<GetToQuotaMoneyOut> queryToQuotaMoneyById(Long id);
-
- /**
- * 鍒犻櫎
- *
- * @param idList id鍒楄〃
- * @return {@link Result<Integer>}
- */
- @PostMapping(path = "/remove")
- Result<Integer> remove(List<Long> idList);
-
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/ITargetController.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/ITargetController.java
index f4a846001940972f7f22247b9beff598c4c26a57..7bc8270ab39598738cf1bcfa1062aa08b4df7e47 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/ITargetController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/api/ITargetController.java
@@ -26,106 +26,5 @@ import java.sql.ResultSet;
@FeignClient("projectplan-provider")
@RequestMapping("target")
public interface ITargetController {
- /**
- * 鑷垜璇勪环瑙嗗浘甯﹀垎椤�
- *
- * @param targetQry 骞�
- * @return {@link Result<TargetListOut>}
- */
- @PostMapping(path = "/selfTargetPage")
- Result<TargetListOut> selfTargetPage(TargetQry targetQry);
-
- /**
- * 璺熻釜璇勪环瑙嗗浘甯﹀垎椤�
- *
- * @param targetQry 涓€骞�
- * @return {@link Result<TargetListOut>}
- */
- @PostMapping(path = "/followTargetPage")
- Result<TargetListOut> followTargetPage(TargetQry targetQry);
-
- /**
- * 缁╂晥鏁存敼瑙嗗浘甯﹀垎椤�
- *
- * @param targetQry 涓€骞�
- * @return {@link Result<TargetListOut>}
- */
- @PostMapping(path = "/reformTargetPage")
- Result<TargetListOut> reformTargetPage(TargetQry targetQry);
-
- /**
- * 淇濆瓨鑷瘎缁╂晥琛�
- *
- * @param cmd cmd
- * @return {@link Result<Object>}
- */
- @PostMapping("/saveTargetPlanSelf")
- Result<Object> saveTargetPlanSelf(TargetCmd cmd);
-
- /**
- * 淇濆瓨璺熻釜缁╂晥琛�
- *
- * @param cmd cmd
- * @return {@link Result<Object>}
- */
- @PostMapping("/saveTargetPlanOwn")
- Result<Object> saveTargetPlanOwn(TargetCmd cmd);
-
- /**
- * 淇濆瓨缁╂晥鏁存敼琛�
- *
- * @param cmd cmd
- * @return {@link Result<Object>}
- */
- @PostMapping("/saveTargetPlanReform")
- Result<Object> saveTargetPlanReform(TargetCmd cmd);
-
- /**
- * 鏌ヨ鐩爣璁″垝
- *
- * @param parentId 鐖秈d
- * @param type 绫诲瀷
- * @return {@link Result<TargetListOut>}
- */
- @PostMapping("/queryTargetPlan")
- Result<QueryTargetPlan> queryTargetPlan(Long parentId, String type);
-
- /**
- * 鏌ヨ鐩爣璁″垝id
- *
- * @param id id
- * @return {@link ResultSet<Object>}
- */
- @PostMapping("/queryTargetByPlanId")
- Result<TargetValueContentOut> queryTargetByPlanId(Long id);
-
- /**
- * 鎻愪氦
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/submitTarget")
- Result<Object> submitTarget(ActionFlowCmd actionFlowCmd);
-
-
- /**
- * 鍥炴粴
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/rollBackTarget")
- Result<Object> rollBackTarget(ActionFlowCmd actionFlowCmd);
-
- /**
- * 鍥炴挙
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @PostMapping("/recallTarget")
- Result<Object> recallTarget(ActionFlowCmd actionFlowCmd);
-
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanBase.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanBase.java
index 645e929f2cb3219195772d3a955878f7509207f1..13491e8457e9e8cbf91c3493b951f40691b0d52e 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanBase.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanBase.java
@@ -220,8 +220,8 @@ public abstract class ProjectPlanBase {
}
protected void departmentOpenVerify(ProjectPlanBookPo projectPlanBookPo){
- ExceptionUtil.isNull(deptSwitchMapper.queryIsOpen(projectPlanBookPo.getDepartmentCode()),"娌℃煡鍒板搴旂殑閮ㄩ棬淇℃伅");
- ExceptionUtil.isTrue("NO".equals(deptSwitchMapper.queryIsOpen(projectPlanBookPo.getDepartmentCode())),"璇ラ儴闂ㄧ姸鎬佹湭寮€鍚�,鏃犳硶鎻愪氦");
+ String s = deptSwitchMapper.queryIsOpen(projectPlanBookPo.getDepartmentCode());
+ ExceptionUtil.isNull(s,"璇ラ儴闂ㄧ姸鎬佹湭寮€鍚�,鏃犳硶鎻愪氦");
}
/**
* 缁╂晥鍒ゆ柇
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/DeptSwitchMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/DeptSwitchMapper.xml
index 778cc4c295c331789c12a797653ff4429a72f3ea..e64c5ea3b12ed63c4d36412a993e35737c04899a 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/DeptSwitchMapper.xml
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/DeptSwitchMapper.xml
@@ -23,6 +23,7 @@
</select>
<select id="queryIsOpen" resultType="java.lang.String">
- select is_open from dept_switch where available = 'YES' and dept_code = #{deptCode}
+ select top 1 is_open from dept_switch where available = 'YES' and dept_code = #{deptCode} and is_open = 'YES'
</select>
+
</mapper>
\ No newline at end of file
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java
index e36d3cc43f0b3fb410b95670879366a538535d23..fb8b4ff0777af3f117f94d2a9ac0b129f56c4282 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java
@@ -1188,13 +1188,60 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook
@Override
public void export(HttpServletRequest request, HttpServletResponse response, ProjectPlanBooksCmd projectPlanBooksCmd) {
- List<ProjectPlanBookFundsDo> projectPlanBookFundsDos = mapper.queryProject(projectPlanBooksCmd);
+ //List<ProjectPlanBookFundsDo> projectPlanBookFundsDos = mapper.queryProject(projectPlanBooksCmd);
+ Page<ProjectPlanBookPo> page;
+ if (ObjectUtils.isEmpty(projectPlanBooksCmd.getPageIndex()) || ObjectUtils.isEmpty(projectPlanBooksCmd.getPageSize())) {
+ page = new Page<>(1, 1000000000);
+ } else {
+ page = new Page<>(1, 1000000000);
+ }
+ if (projectPlanBooksCmd.getYear() == null) {
+ BudgetSwitchOut out = baseConfigRepository.queryBudgetSwitchPageByType("涓€涓�");
+ projectPlanBooksCmd.setYear(out.getYear());
+ }
+ QueryWrapper<ProjectPlanBookPo> wrapper = new QueryWrapper<>();
+ //蹇呴』鏉′欢
+ wrapper.eq("year", projectPlanBooksCmd.getYear());
+ if (!ObjectUtils.isEmpty(projectPlanBooksCmd.getProjectName())) {
+ wrapper.like("project_name", projectPlanBooksCmd.getProjectName());
+ }
+ if (!ObjectUtils.isEmpty(projectPlanBooksCmd.getDepartmentCode())) {
+ wrapper.eq("department_code", projectPlanBooksCmd.getDepartmentCode());
+ }
+ if (!ObjectUtils.isEmpty(projectPlanBooksCmd.getProjectType())) {
+ wrapper.like("project_type", projectPlanBooksCmd.getProjectType());
+ }
+ wrapper.eq("plan_type", PlanTypeEnum.ERSHANG);
+ //wrapper.eq("state","瀹℃牳瀹屾垚");
+ if (!ObjectUtils.isEmpty(projectPlanBooksCmd.getPlanBookType())) {
+ wrapper.eq("plan_book_type", projectPlanBooksCmd.getPlanBookType());
+ }
+ List<ProjectPlanBookPo> projectPlanBookPos = mapper.selectPage(page, wrapper).getRecords();
+ List<ProjectPlanBooksOut> projectPlanBooksOuts = new ArrayList<>();
+ for (ProjectPlanBookPo projectPlanBookPo : projectPlanBookPos) {
+ ProjectPlanBooksOut projectPlanBookOut = MapperUtils.INSTANCE.map(ProjectPlanBooksOut.class, projectPlanBookPo);
+ HashMap<String, Object> objectHashMap = new HashMap<>(1);
+ objectHashMap.put("ProjectPlanID", projectPlanBookPo.getId());
+ List<ExpenseCardNumberPo> expenseCardNumberPos = expenseCardNumberMapper.selectByMap(objectHashMap);
+ if (!ObjectUtils.isEmpty(expenseCardNumberPos)) {
+ projectPlanBookOut.setNumber(expenseCardNumberPos.get(0).getNumber());
+ projectPlanBookOut.setFunCode(expenseCardNumberPos.get(0).getFunCode());
+ if (!ObjectUtils.isEmpty(expenseCardNumberPos.get(0).getNumber()) && !ObjectUtils.isEmpty(expenseCardNumberPos.get(0).getFunCode())) {
+ projectPlanBookOut.setJudge(true);
+ } else {
+ projectPlanBookOut.setJudge(false);
+ }
+ } else {
+ projectPlanBookOut.setJudge(false);
+ }
+ projectPlanBooksOuts.add(projectPlanBookOut);
- if (projectPlanBookFundsDos.size() <= 0) {
+ }
+ if (projectPlanBooksOuts.size() <= 0) {
throw new DataAccessException(new Error(ResponseCode.DATA_ACCESS_NOT_FOUND, null, "鏃犲彲瀵煎嚭鍏宠仈缁忚垂鍗″彿", ""));
}
- List<ExportProjectPlanBookOut> exportProjectPlanBookOuts = MapperUtils.INSTANCE.mapAsList(ExportProjectPlanBookOut.class, projectPlanBookFundsDos);
+ List<ExportProjectPlanBookOut> exportProjectPlanBookOuts = MapperUtils.INSTANCE.mapAsList(ExportProjectPlanBookOut.class, projectPlanBooksOuts);
response.reset();
response.setCharacterEncoding("UTF-8");
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/AttachmentController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/AttachmentController.java
index d008dbfb3ca2d983a593d705374319b7ac0e1f8f..b2aa07101556be1f4173281c608d882b61d7762c 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/AttachmentController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/AttachmentController.java
@@ -43,46 +43,25 @@ public class AttachmentController extends BaseController implements IAttachmentC
@Resource
AttachmentSvr attachmentSvr;
- /**
- * 涓嬭浇闄勪欢 闄勪欢涓嬭浇 @param response 鍝嶅簲
- *
- * @param attachmentQry 闄勪欢qry
- * @throws IOException ioexception
- */
- //@Override
+ @PostMapping(path = "downloadAttachment")
@ApiOperation("1.涓嬭浇闄勪欢")
public void downloadAttachment(HttpServletResponse response,AttachmentQry attachmentQry) {
queryService.downAttachment(response, attachmentQry.getId());
}
- /**
- * 鍒犻櫎闄勪欢 闄勪欢鍒犻櫎 @param request 璇锋眰
- *
- * @return {@link Object}
- * @throws IOException ioexception
- */
- //@Override
+ @PostMapping(path = "removeAttachment")
@ApiOperation("1.鍒犻櫎闄勪欢")
public Object removeAttachment(AttachmentQry request) {
return ok(ResponseCode.SUCCESS, cmdService.removeAttachment(request.getId()));
}
@ApiOperation("鍒犻櫎闄勪欢")
- //@Override
+ @PostMapping(path = "removeBatchAttachment")
public Object removeBatchAttachment(List<Long> idList) {
return ok(ResponseCode.SUCCESS, cmdService.removeBatchAttachment(idList));
}
- /**
- * 涓婁紶闄勪欢鍒楄〃
- * 澶氫釜鏂囦欢涓婁紶
- *
- * @param files 鏂囦欢
- * @param request 璇锋眰
- * @return {@link Object}
- * @throws Exception 寮傚父
- */
- //@Override
+ @PostMapping(path = "uploadAttachmentList")
@ApiOperation("1.澶氫釜鏂囦欢涓婁紶")
public Object uploadAttachmentList(MultipartFile[] files, AttachmentCmd request) {
List<AttachmentInfoOut> outList = new ArrayList<>();
@@ -115,7 +94,7 @@ public class AttachmentController extends BaseController implements IAttachmentC
return ok(ResponseCode.SUCCESS, outList);
}
- @Override
+ @PostMapping(path = "updateAttachmentRelevance")
@ApiOperation("闄勪欢鍏宠仈鐢虫姤涔�")
public Result<Integer> updateAttachmentRelevance(AttachmentRelevanceCmd attachmentRelevanceCmd) {
return ok(ResponseCode.SUCCESS, attachmentSvr.updateAttachmentRelevance(attachmentRelevanceCmd.getAttachmentIds(), attachmentRelevanceCmd.getPlanId(), attachmentRelevanceCmd.getPlanId()));
@@ -128,7 +107,7 @@ public class AttachmentController extends BaseController implements IAttachmentC
* @param request 闄勪欢鐩稿叧cmd
* @return {@link Result<Integer>}
*/
- @Override
+ @PostMapping(path = "selectByCoordinateAndPid")
@ApiOperation("鏌ヨ鏍＄骇瀹℃牳闄勪欢鍒楄〃")
public Result<AttachmentInfoOut> selectByCoordinateAndPid(AttachmentQry request) {
return ok(ResponseCode.SUCCESS,queryService.selectByCoordinateAndPid(request));
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java
index 8f4599546e22a1f5869b23c4bc9f800bf0a204a3..3d44219705a4f90f524669d4decd9b952660c0f6 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java
@@ -27,6 +27,7 @@ import com.seasky.projectplan.dto.baseconfig.personfund.PersonTemplateExport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -78,7 +79,7 @@ public class BaseConfigController implements IBaseConfigController {
IUser iUser;
@ApiOperation("login")
- @Override
+ @PostMapping("/loginUserInfo")
// @PostConstruct
public Result<Object> loginUserInfo() {
try {
@@ -93,75 +94,75 @@ public class BaseConfigController implements IBaseConfigController {
}
@ApiOperation("1.淇敼鐢虫姤鎺у埗鏃ユ湡涓庡勾浠�")
- @Override
+ @PostMapping("/saveBudgetSwitch")
public Result<Object> saveBudgetSwitch(@RequestBody BudgetSwitchCmd cmd) {
budegtSwitchSvr.saveBudgetSwitch(cmd);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("1.鍒濆鍖栫敵鎶ユ帶鍒�")
- @Override
+ @PostMapping("/initBudgetDeptSwitch")
public Result<Object> initBudgetDeptSwitch(@RequestBody InitBudgetCmd type) {
budegtSwitchSvr.initBudgetDeptSwitch(type);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("1.鎵撳紑閮ㄩ棬寮€鍏�")
- @Override
+ @PostMapping("/openDeptSwitch")
public Result<Object> openDeptSwitch(@RequestBody List<Long> ids) {
deptSwitchSvr.openDeptSwitch(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("1.鍏抽棴閮ㄩ棬寮€鍏�")
- @Override
+ @PostMapping("/closeDeptSwitch")
public Result<Object> closeDeptSwitch(@RequestBody List<Long> ids) {
deptSwitchSvr.closeDeptSwitch(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("1.鏌ヨ褰撳墠鏃堕棿鏄惁鍦� 棰勭畻鎺у埗鍖洪棿")
- @Override
+ @PostMapping("/queryBudgetSwitchDetail")
public Result<Boolean> queryBudgetSwitchDetail(BudgetSwitchQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryBudgetSwitchDetail(qry));
}
@ApiOperation("1.鍒ゆ柇褰撳墠鐢ㄦ埛閮ㄩ棬 鏄惁鍦� 鍙敤鐢虫姤閮ㄩ棬涓�")
- @Override
+ @PostMapping("/judgeCurrentUserDeptAtDeptSwitch")
public Result<Boolean> judgeCurrentUserDeptAtDeptSwitch(BudgetSwitchQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.judgeCurrentUserDeptAtDeptSwitch(qry));
}
@ApiOperation("1.鏌ヨ褰撳墠棰勭畻鎺у埗淇℃伅")
- @Override
+ @PostMapping("/queryBudgetDeptSwitchDetail")
public Result<BudgetSwitchOut> queryBudgetDeptSwitchDetail(@RequestBody BudgetSwitchQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryBudgetSwitchPageByType(qry));
}
@ApiOperation("2.淇濆瓨鎵╁睍琛ㄤ俊鎭紙鏂板鎴栦慨鏀癸級")
- @Override
+ @PostMapping("/saveExtendFormManage")
public Result<Object> saveExtendFormManage(@RequestBody List<ExtendFormManageCmd> cmd) {
extendFromManageSvr.saveExtendFormManage(cmd);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("2.鍒犻櫎鎵╁睍琛ㄤ俊鎭�")
- @Override
+ @PostMapping("/deleteExtendFormManage")
public Result<Object> deleteExtendFormManage(@RequestBody List<Long> ids) {
extendFromManageSvr.deleteExtendFormManage(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("2.寮€鍚墿灞曡〃")
- @Override
+ @PostMapping("/openExtendFormManage")
public Result<Object> openExtendFormManage(@RequestBody List<Long> ids) {
extendFromManageSvr.openExtendFormManage(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("2.鍏抽棴鎵╁睍琛�")
- @Override
+ @PostMapping("/closeExtendFormManage")
public Result<Object> closeExtendFormManage(@RequestBody List<Long> ids) {
extendFromManageSvr.closeExtendFormManage(ids);
return ok(ResponseCode.SUCCESS);
@@ -169,58 +170,37 @@ public class BaseConfigController implements IBaseConfigController {
@ApiOperation("2.鏌ヨ鍗曚釜鎵╁睍琛ㄤ俊鎭�")
- @Override
+ @PostMapping("/queryExtendFormById")
public Result<ExtendFormManageOut> queryExtendFormById(@RequestParam("id") Long id) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryExtendFormById(id));
}
@ApiOperation("2.鍒嗛〉鏌ヨ鍗曚釜鎵╁睍琛ㄤ俊鎭�")
- @Override
+ @PostMapping("/exportExtendFormPage")
public void exportExtendFormPage(HttpServletRequest request, HttpServletResponse response, @RequestBody ExtendFormManageQry qry) {
baseConfigQuerySvr.exportExtendFormPage(request, response, qry);
}
@ApiOperation("2.鏌ヨ瀵煎嚭鍗曚釜鎵╁睍琛ㄤ俊鎭�")
- @Override
+ @PostMapping("/queryExtendFormPage")
public Result<ExtendFormManageOut> queryExtendFormPage(@RequestBody ExtendFormManageQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryExtendFormPage(qry));
}
- /**
- * 涓嬭浇绉戠洰鎵╁睍琛ㄨ缃ā鏉�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @Override
+ @PostMapping(path = "/downLoadExtendFormTemplate")
@ApiOperation("2.涓嬭浇绉戠洰鎵╁睍琛ㄨ缃ā鏉�")
public void downLoadExtendFormTemplate(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.downLoadExtendFormTemplate(request, response);
}
- /**
- * 瀵煎叆绉戠洰鎵╁睍琛ㄨ缃�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping(path = "/importExtendForm")
@ApiOperation("2.瀵煎叆绉戠洰鎵╁睍琛ㄨ缃�")
public Result<Object> importExtendForm(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
extendFromManageSvr.importExtendForm(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎嚭绉戠洰鎵╁睍琛ㄨ缃�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param qry qry
- */
- @Override
+ @PostMapping(path = "/exportExtendForm")
@ApiOperation("2.瀵煎嚭绉戠洰鎵╁睍琛ㄨ缃�")
public void exportExtendForm(HttpServletRequest request, HttpServletResponse response, @RequestBody ExtendFormManageQry qry) {
baseConfigQuerySvr.exportExtendForm(request, response, qry);
@@ -228,86 +208,66 @@ public class BaseConfigController implements IBaseConfigController {
@ApiOperation("2.鏍规嵁鎵╁睍琛ㄨ幏鍙栨墍鏈夌浉鍏崇殑淇℃伅")
- @Override
+ @PostMapping("/queryExtendFormByTable")
public Result<ExtendFormManageOut> queryExtendFormByTable(@RequestParam("extendName") String extendName) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryExtendFormByTable(extendName));
}
@ApiOperation("2.鍘婚噸鏄剧ず鎵€鏈夌殑鎵╁睍琛ㄥ悕闆嗗悎")
- @Override
+ @PostMapping("/queryExtendFormName")
public Result<String> queryExtendFormName() {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryExtendFormName());
}
@ApiOperation("3.瀛樺偍璁惧绫诲瀷")
- @Override
+ @PostMapping("/saveDeviceType")
public Result<Object> saveDeviceType(@RequestBody List<DeviceTypeCmd> cmd) {
deviceTypeSvr.saveDeviceType(cmd);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("3.鍒犻櫎璁惧绫诲瀷")
- @Override
+ @PostMapping("/deleteDeviceType")
public Result<Object> deleteDeviceType(@RequestBody List<Long> ids) {
deviceTypeSvr.deleteDeviceType(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("3.鏌ヨ鍗曚釜璁惧绫诲瀷淇℃伅")
- @Override
+ @PostMapping("/queryDeviceTypeById")
public Result<DeviceTypeOut> queryDeviceTypeById(@RequestParam("id") Long id) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryDeviceTypeById(id));
}
@ApiOperation("3.鍒嗛〉鏌ヨ璁惧绫诲瀷")
- @Override
+ @PostMapping("/queryDevicePage")
public Result<DeviceTypeOut> queryDevicePage(@RequestBody DeviceTypeQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryDevicePage(qry));
}
@ApiOperation("3.鍒楄〃鏌ヨ璁惧绫诲瀷")
- @Override
+ @PostMapping("/queryDeviceList")
public Result<DeviceTypeOut> queryDeviceList() {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryDeviceList());
}
- /**
- * 涓嬭浇 璁惧绫诲瀷 妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @Override
+ @PostMapping(path = "/downLoadDeviceTypeTemplate")
@ApiOperation("3. 璁惧绫诲瀷 瀵煎叆妯＄増涓嬭浇")
public void downLoadDeviceTypeTemplate(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.downLoadDeviceTypeTemplate(request, response);
}
- /**
- * 瀵煎叆 璁惧绫诲瀷
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping(path = "/importDeviceType")
@ApiOperation("3.瀵煎叆 璁惧绫诲瀷")
public Result<Object> importDeviceType(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
deviceTypeSvr.importDeviceType(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎嚭 璁惧绫诲瀷
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @Override
+ @PostMapping(path = "/exportDeviceType")
@ApiOperation("3.瀵煎嚭 璁惧绫诲瀷")
public void exportDeviceType(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.exportDeviceType(request, response);
@@ -315,71 +275,51 @@ public class BaseConfigController implements IBaseConfigController {
}
@ApiOperation("4.瀛樺偍淇℃伅鍖栫被鍨�")
- @Override
+ @PostMapping("/saveInformationType")
public Result<Object> saveInformationType(@RequestBody List<InformationTypeCmd> cmd) {
informationTypeSvr.saveInformationType(cmd);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("4.鍒犻櫎淇℃伅鍖栫被鍨�")
- @Override
+ @PostMapping("/deleteInformationType")
public Result<Object> deleteInformationType(@RequestBody List<Long> ids) {
informationTypeSvr.deleteInformationType(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("4.鏌ヨ鍗曚釜淇℃伅鍖栫被鍨嬩俊鎭�")
- @Override
+ @PostMapping("/queryInformationById")
public Result<InformationTypeOut> queryInformationById(@RequestParam("id") Long id) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryInformationById(id));
}
@ApiOperation("4.鍒嗛〉鏄剧ず淇℃伅鍖栭」鐩被鍨�")
- @Override
+ @PostMapping("/queryInformation")
public Result<InformationTypeOut> queryInformation(@RequestBody InformationTypeQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryInformation(qry));
}
@ApiOperation("4.鐢ㄦ爲褰㈢粨鏋勬樉绀轰俊鎭寲椤圭洰绫诲瀷")
- @Override
+ @PostMapping("/queryInformationTree")
public Result<InformationTypeTree1> queryInformationTree() {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryInformationTree());
}
- /**
- * 涓嬭浇 淇℃伅鍖栫被鍨� 妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @Override
+ @PostMapping(path = "/downLoadInformationTemplate")
@ApiOperation("4.涓嬭浇 淇℃伅鍖栫被鍨� 瀵煎叆妯＄増")
public void downLoadInformationTemplate(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.downLoadInformationTemplate(request, response);
}
- /**
- * 瀵煎嚭 淇℃伅鍖栫被鍨�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
- @Override
+ @PostMapping(path = "/exportInformation")
@ApiOperation("4.瀵煎嚭 淇℃伅鍖栫被鍨�")
public void exportInformation(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.exportInformation(request, response);
}
- /**
- * 瀵煎叆 淇℃伅鍖栫被鍨�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping(path = "/importInformation")
@ApiOperation("4.瀵煎叆 淇℃伅鍖栫被鍨�")
public Result<Object> importInformation(HttpServletRequest request, HttpServletResponse response,@RequestParam(value = "file") MultipartFile file) {
informationTypeSvr.importInformation(request, response, file);
@@ -387,140 +327,91 @@ public class BaseConfigController implements IBaseConfigController {
}
@ApiOperation("5.瀛樺偍浜哄憳缁忚垂绉戠洰淇℃伅")
- @Override
+ @PostMapping("/savePersonFund")
public Result<Object> savePersonFund(@RequestBody List<PersonFundCmd> cmd) {
personFundSvr.savePersonFund(cmd);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("5.鍒犻櫎浜哄憳缁忚垂绉戠洰淇℃伅")
- @Override
+ @PostMapping("/deletePersonFund")
public Result<Object> deletePersonFund(@RequestBody List<Long> ids) {
personFundSvr.deletePersonFund(ids);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("5.鏌ヨ鍗曚釜浜哄憳缁忚垂绉戠洰淇℃伅")
- @Override
+ @PostMapping("/queryPersonFundById")
public Result<Object> queryPersonFundById(@RequestParam("id") Long id) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryPersonFundById(id));
}
@ApiOperation("5.鍒嗛〉鏄剧ず浜哄憳缁忚垂绉戠洰闆嗗悎")
- @Override
+ @PostMapping("/queryPersonFundPage")
public Result<PersonFundOut> queryPersonFundPage(@RequestBody PersonFundQry qry) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryPersonFundPage(qry));
}
- /**
- * 涓嬭浇 浜哄憳缁忚垂璁剧疆 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
@ApiOperation("5.涓嬭浇 浜哄憳缁忚垂瀵煎叆妯℃澘")
- @Override
+ @PostMapping(path = "/downLoadPersonFundTemplate")
public void downLoadPersonFundTemplate(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.downLoadPersonFundTemplate(request, response);
}
- /**
- * 涓嬭浇 浜哄憳缁忚垂瀵煎叆妯℃澘(鏂�)
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link PersonFundOut}>
- */
@ApiOperation("涓嬭浇 浜哄憳缁忚垂瀵煎叆妯℃澘(鏂�)")
- @Override
+ @PostMapping(path = "/downLoadPersonFundTemplateNew")
public Result<PersonTemplateExport> downLoadPersonFundTemplateNew(HttpServletRequest request, HttpServletResponse response) {
List<PersonTemplateExport> personTemplateExportList = baseConfigQuerySvr.downLoadPersonFundTemplateNew(request, response);
return ok(ResponseCode.SUCCESS,personTemplateExportList);
}
- /**
- * 瀵煎叆(鍓嶇鐢�,涓昏涓轰簡浼犳暟鎹�)
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
@ApiOperation("瀵煎叆浜哄憳淇℃伅(鏂�)")
- @Override
+ @PostMapping(path = "/importNew")
public Result<PersonTemplateExport> importNew(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
List<PersonTemplateExport> personTemplateExportList = baseConfigQuerySvr.importNew(request, response, file);
return ok(ResponseCode.SUCCESS,personTemplateExportList);
}
- /**
- * 瀵煎嚭 浜哄憳缁忚垂璁剧疆
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
@ApiOperation("5.瀵煎嚭 浜哄憳缁忚垂")
- @Override
+ @PostMapping(path = "/exportPersonFund")
public void exportPersonFund(HttpServletRequest request, HttpServletResponse response) {
baseConfigQuerySvr.exportPersonFund(request, response);
}
- /**
- * 瀵煎嚭浜哄憳缁忚垂(鏂�)
- *
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param id id
- * @return {@link Result}<{@link Object}>
- */
@ApiOperation("瀵煎嚭浜哄憳缁忚垂(鏂�)")
- @Override
+ @PostMapping(path = "/exportPersonFundNew")
public Result<Object> exportPersonFundNew(HttpServletRequest request, HttpServletResponse response, Long id) {
baseConfigQuerySvr.exportPersonFundNew(request,response,id);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎叆 浜哄憳缁忚垂璁剧疆
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
@ApiOperation("5.瀵煎叆 浜哄憳缁忚垂")
- @Override
+ @PostMapping(path = "/importPersonFund")
public Result<Object> importPersonFund(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
personFundSvr.importPersonFund(request, response, file);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("5.鍒楄〃鏄剧ず浜哄憳缁忚垂绉戠洰闆嗗悎")
- @Override
+ @PostMapping("/queryPersonFundList")
public Result<PersonFundOut> queryPersonFundList() {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryPersonFundList());
}
@ApiOperation("6.鏍规嵁绫诲瀷鑾峰彇绯荤粺閰嶇疆鐨勫勾浠�")
- @Override
+ @PostMapping("/queryConfigYearByType")
public Result<Integer> queryConfigYearByType(String type) {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.queryConfigYearByType(type));
}
@ApiOperation("7.鎸囧畾瀵硅薄鍚姩娴佺▼")
- @Override
+ @PostMapping("/startFlowByDocument")
public Result<Integer> startFlowByDocument() {
return ok(ResponseCode.SUCCESS, baseConfigQuerySvr.startFlowByDocument());
}
- /**
- * 鏌ヨ浜轰唬鐮佸拰鍚嶇О
- *
- * @return {@link Result}<{@link PersonFundOut}>
- */
@ApiOperation("鏌ヨ鎵€鏈変汉鐨勪唬鐮佸拰鍚嶇О")
- @Override
+ @PostMapping("/queryPersonCodeAndName")
public Result<PersonFundOut> queryPersonCodeAndName() {
return ok(ResponseCode.SUCCESS,baseConfigQuerySvr.queryPersonCodeAndName());
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java
index 2d7efda14a221ba30b1d040ecf9e6d0cdcf696c7..36321f1a580a39290282441054596bf127f81482 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java
@@ -23,6 +23,7 @@ import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -59,19 +60,19 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr
private String loginUrl;
@ApiOperation("鑾峰彇褰撳墠鐧诲綍浜烘墍鍦ㄩ儴浠泦鍚�")
- @Override
+ @PostMapping(path = "/queryCurrentUserDeptList")
public Result<OrganizationDTO> queryCurrentUserDeptList() {
return ok(ResponseCode.SUCCESS, userRPC.queryCurrentUserDeptList());
}
@ApiOperation("鑾峰彇褰撳墠鐧诲綍浜哄鍚�")
- @Override
+ @PostMapping(path = "/queryCurrentUserName")
public Result<String> queryCurrentUserName() {
return ok(ResponseCode.SUCCESS, iUser.getCurrent("").getData().get(0).getName());
}
@ApiOperation("鑾峰彇褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ瀵间俊鎭�")
- @Override
+ @PostMapping(path = "/queryCurrentUserDepartmentHead")
public Result<UserDTO> queryCurrentUserDepartmentHead() {
//鐧诲綍浜烘墍鍦ㄩ儴闂�
List<OrganizationDTO> organizationDTOList = userRPC.queryCurrentUserDeptList();
@@ -90,30 +91,19 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr
}
@ApiOperation("鑾峰彇鎵€鏈夌敤鎴蜂俊鎭甫鍒嗛〉")
- @Override
+ @PostMapping(path = "/queryUserPage")
public Result<UserDTO> queryUserPage(@RequestBody UserQry userQry) {
return ok(ResponseCode.SUCCESS, userRPC.queryUserPage(userQry));
}
- /**
- * 鏌ヨ閮ㄩ棬椤甸潰
- *
- * @param deptQry 閮ㄩ棬qry
- * @return {@link Result<OrganizationSystemOut>}
- */
@ApiOperation("鑾峰彇鎵€鏈夐儴闂ㄤ俊鎭甫鍒嗛〉")
- @Override
+ @PostMapping(path = "/queryDeptPage")
public Result<OrganizationSystemOut> queryDeptPage(@RequestBody DeptQry deptQry) {
return ok(ResponseCode.SUCCESS, userRPC.queryAllOrganization(deptQry));
}
- /**
- * 鑿滃崟鐢眂ur鐢ㄦ埛鍒楄〃
- *
- * @return {@link Result<MenuDTO>}
- */
@ApiOperation("鑾峰彇褰撳墠鐧诲綍浜烘墍鎷ユ湁鐨勮彍鍗�")
- @Override
+ @PostMapping(path = "/listMenuByCurUser")
public Result<MenuDTO> listMenuByCurUser() {
List<MenuDTO> menuList = iUser.getCurrent("").getData().get(0).getMenuList();
@@ -126,7 +116,7 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr
}
@ApiOperation("鑾峰彇浜岀骇鑿滃崟")
- @Override
+ @PostMapping(path = "/listSecondaryMenu")
public Result<MenuDTO> listSecondaryMenu() {
UserDTO dtoUser = iUser.getCurrent("").getData().get(0);
List<MenuDTO> menuList = dtoUser.getMenuList();
@@ -142,7 +132,7 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr
}
@ApiOperation("鑾峰彇瀛愮骇鑿滃崟")
- @Override
+ @PostMapping(path = "/listChildrenMenu")
public Result<MenuDTO> listChildrenMenu(Long id) {
UserDTO dtoUser = iUser.getCurrent("").getData().get(0);
List<MenuDTO> menuList = dtoUser.getMenuList();
@@ -176,13 +166,8 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr
return ok(ResponseCode.SUCCESS, menuList);
}
- /**
- * 鐧诲綍浜�
- *
- * @return {@link Result<String>}
- */
@ApiOperation("鐧诲綍娉ㄩ攢")
- @Override
+ @PostMapping(path = "/loginOut")
public LoginOut loginOut() {
try {
SecurityUtils.getSubject().logout();
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BudgetInfoController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BudgetInfoController.java
index ba29eea89f3c6f0c9e43750fa704ddcb2623be54..049fd3aa7755f38bebfa3f61a225237de45d29c4 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BudgetInfoController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BudgetInfoController.java
@@ -44,7 +44,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<Integer>}
*/
@ApiOperation("1.淇濆瓨椤圭洰绫诲瀷")
- @Override
+ @PostMapping(path = "/createBudgetInfo")
public Result<Long> saveBudgetInfo(@RequestBody BudgetInfoCmd budgetInfoCmd) {
return ok(ResponseCode.SUCCESS, commandService.saveBudgetInfo(budgetInfoCmd));
}
@@ -56,7 +56,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return Long
*/
@ApiOperation(value = "1.1 淇濆瓨椤圭洰绫诲瀷锛堝彧鍏佽鍒涘缓浜岀骇椤圭洰绫诲瀷锛�")
- @Override
+ @PostMapping(path = "/verifyCreateBudgetInfo")
public Result<Long> verifyCreateBudgetInfo(@RequestBody BudgetInfoCmd budgetInfoCmd) {
return ok(ResponseCode.SUCCESS, commandService.verifyCreateBudgetInfo(budgetInfoCmd));
}
@@ -68,7 +68,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<Integer>}
*/
@ApiOperation("2.鍒犻櫎椤圭洰绫诲瀷")
- @Override
+ @PostMapping(path = "/removeBudgetInfo")
public Result<Integer> removeBudgetInfo(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, commandService.removeBudgetInfo(ids));
}
@@ -82,7 +82,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<Object>}
*/
@ApiOperation("3.瀵煎叆椤圭洰绫诲瀷")
- @Override
+ @PostMapping(path = "/importBudgetInfo")
public Result<Object> importBudgetInfo(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file")MultipartFile file) {
commandService.importBudgetInfo(request,response,file);
return ok(ResponseCode.SUCCESS);
@@ -97,7 +97,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<BudgetInfoOut>}
*/
@ApiOperation("Q1.鏌ヨ椤圭洰绫诲瀷鏄庣粏")
- @Override
+ @PostMapping(path = "/queryBudgetInfo")
public Result<BudgetInfoOut> queryBudgetInfoById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryBudgetInfoById(id));
}
@@ -109,13 +109,13 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<FundTreeOut>}
*/
@ApiOperation("Q2.鏌ヨ椤圭洰绫诲瀷鍒楄〃鏍�")
- @Override
+ @PostMapping("queryBudgetInfoTree")
public Result<BudgetInfoTreeOut> queryBudgetInfoListTree(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryBudgetInfoListTree(budgetInfoQry));
}
@ApiOperation("Q2.1 鏍规嵁褰撳墠鐧诲綍浜虹殑閮ㄩ棬鏄惁鍦ㄩ」鐩殑褰掑彛閮ㄩ棬涓睍绀洪」鐩被鍨嬩俊鎭爲")
- @Override
+ @PostMapping("queryBudgetInfoTreeByUser")
public Result<BudgetInfoTreeOut> queryBudgetInfoListTreeByUser(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS,queryService.queryBudgetInfoListTreeByUser(budgetInfoQry));
}
@@ -128,7 +128,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<BudgetInfoOut>}
*/
@ApiOperation("Q3.鏌ヨ鐖剁骇id涓嬫墍鏈夊瓙绾ч」鐩被鍨嬩俊鎭�")
- @Override
+ @PostMapping(path = "/queryBudgetInfoPageByPId")
public Result<BudgetInfoOut> queryBudgetInfoPageByPId(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryBudgetInfoPageByParentNodeId(budgetInfoQry));
}
@@ -141,25 +141,25 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<BudgetInfoOut>}
*/
@ApiOperation("Q3.鏌ヨ鐖剁骇id涓嬫墍鏈夊瓙绾ч」鐩被鍨嬩俊鎭�-褰掑彛椤圭洰绫诲瀷")
- @Override
+ @PostMapping(path = "/queryUserBudgetInfoPageByPId")
public Result<BudgetInfoOut> queryUserBudgetInfoPageByPId(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryUserBudgetInfoPageByPId(budgetInfoQry));
}
@ApiOperation("鐢虫姤搴�.鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂� 鍙敤椤圭洰绫诲瀷 鍒楄〃")
- @Override
+ @PostMapping(path = "/queryBudgetInfoListByCurrentUserDept")
public Result<BudgetInfoOut> queryBudgetInfoListByCurrentUserDept(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryBudgetInfoListByCurrentUserDept(budgetInfoQry));
}
@ApiOperation("褰掑彛閮ㄩ棬鐢虫姤.鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂� 鍙敤椤圭洰绫诲瀷 鍒楄〃")
- @Override
+ @PostMapping(path = "/queryGuiKouBudgetInfoListByCurrentUserDept")
public Result<BudgetInfoOut> queryGuiKouBudgetInfoListByCurrentUserDept(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryGuiKouBudgetInfoListByCurrentUserDept(budgetInfoQry));
}
@ApiOperation("鏌ヨ褰撳墠鐢ㄦ埛鎵€鍦ㄩ儴闂� 鍙敤鏃ュ父缁忚垂鍒楄〃")
- @Override
+ @PostMapping(path = "/queryRiChangBudgetInfoListByDept")
public Result<BudgetInfoOut> queryRiChangBudgetInfoListByDept(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryRiChangBudgetInfoListByDept(budgetInfoQry));
}
@@ -171,13 +171,13 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @param response 鍝嶅簲
*/
@ApiOperation("瀵煎嚭椤圭洰绫诲瀷")
- @Override
+ @PostMapping(path = "/exportBudgetInfo")
public Result<Object> exportBudgetInfo(HttpServletRequest request, HttpServletResponse response) {
queryService.exportBudgetInfo(request,response);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping(path = "/importBudgetInfoTemplate")
@ApiOperation("椤圭洰绫诲瀷瀵煎叆妯℃澘")
public Result<Object> importBudgetInfoTemplate(HttpServletRequest request, HttpServletResponse response) {
queryService.importBudgetInfoTemplate(request,response);
@@ -191,7 +191,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @return {@link Result<BudgetInfoOut>}
*/
@ApiOperation("Q6.鏌ヨ鎵€鏈夊彾瀛愯妭鐐归」鐩被鍨嬩俊鎭�")
- @Override
+ @PostMapping(path = "/queryLeafNodeBudgetInfoPage")
public Result<BudgetInfoOut> queryLeafNodeBudgetInfoPage(@RequestBody BudgetInfoQry budgetInfoQry) {
return ok(ResponseCode.SUCCESS, queryService.queryLeafNodeBudgetInfoPage(budgetInfoQry));
}
@@ -210,7 +210,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @param response 鍝嶅簲
* @return {@link Result}<{@link Object}>
*/
- @Override
+ @PostMapping(path = "/importProjectLibraryTemplate")
@ApiOperation("鍒嗙被椤圭洰搴撳鍏ユā鏉�")
public Result<Object> importProjectLibraryTemplate(HttpServletRequest request, HttpServletResponse response) {
queryService.importProjectLibraryTemplate(request, response);
@@ -225,7 +225,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @param file 鏂囦欢
* @return {@link Result}<{@link Object}>
*/
- @Override
+ @PostMapping(path = "/importProjectLibrary")
@ApiOperation("鍒嗙被椤圭洰搴撳鍏�")
public Result<Object> importProjectLibrary(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
commandService.importProjectLibrary(request,response,file);
@@ -239,7 +239,7 @@ public class BudgetInfoController extends BaseController implements IBudgetInfo
* @param response 鍝嶅簲
* @return {@link Result}<{@link Object}>
*/
- @Override
+ @PostMapping(path = "/exportProjectLibrary")
@ApiOperation("鍒嗙被椤圭洰搴撳鍑�")
public Result<Object> exportProjectLibrary(HttpServletRequest request, HttpServletResponse response) {
queryService.exportProjectLibrary(request, response);
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundController.java
index 4bb62788debfb22837b78de8f5c09d26cd54a2ef..c6b362ef72a7781bd5d30535ed5ce0c020c80110 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundController.java
@@ -8,6 +8,7 @@ import com.seasky.projectplan.application.query.fund.FundQueryService;
import com.seasky.projectplan.dto.fund.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -45,7 +46,7 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<Integer>}
*/
@ApiOperation("1.淇濆瓨缁忔祹绉戠洰")
- @Override
+ @PostMapping(path = "/createFund")
public Result<Long> saveFund(@RequestBody FundCmd fundCmd) {
return ok(ResponseCode.SUCCESS, fundSvr.saveFund(fundCmd));
}
@@ -57,7 +58,7 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<Integer>}
*/
@ApiOperation("2.鍒犻櫎缁忔祹绉戠洰")
- @Override
+ @PostMapping(path = "/removeFund")
public Result<Integer> removeFund(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, fundSvr.removeFund(ids));
}
@@ -71,13 +72,13 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<Object>}
*/
@ApiOperation("3.瀵煎叆缁忔祹绉戠洰")
- @Override
+ @PostMapping(path = "/importFund")
public Result<Object> importFund(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file")MultipartFile file) {
fundSvr.importFund(request,response,file);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping(path = "/importFundTemplate")
@ApiOperation("瀵煎叆缁忔祹绉戠洰妯℃澘")
public Result<Object> importFundTemplate(HttpServletRequest request, HttpServletResponse response) {
fundQueryService.importFundTemplate(request,response);
@@ -93,7 +94,7 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-1.鏌ヨ缁忔祹绉戠洰鏄庣粏")
- @Override
+ @PostMapping(path = "/queryFund")
public Result<FundOut> queryFundById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, fundQueryService.queryFundById(id));
}
@@ -105,7 +106,7 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<FundTreeOut>}
*/
@ApiOperation("1-2.鏌ヨ缁忔祹绉戠洰鍒楄〃鏍�")
- @Override
+ @PostMapping("queryFundTree")
public Result<FundTreeOut> queryFundListTree(@RequestBody FundQry fundQry) {
return ok(ResponseCode.SUCCESS, fundQueryService.queryFundListTree(fundQry));
}
@@ -117,7 +118,7 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-3.閫氳繃鐖惰妭鐐筰d 鍒嗛〉 鏌ヨ缁忔祹绉戠洰")
- @Override
+ @PostMapping(path = "/queryFundPageByPId")
public Result<FundOut> queryFundPageByParentNodeId(@RequestBody FundQry fundQry) {
return ok(ResponseCode.SUCCESS, fundQueryService.queryFundPageByParentNodeId(fundQry));
}
@@ -130,7 +131,7 @@ public class FundController extends BaseController implements IFund {
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-4.鏌愰」鐩被鍨嬬殑鍙娇鐢ㄧ粡娴庣鐩�")
- @Override
+ @PostMapping(path = "/queryFundListByBudgetId")
public Result<InfoCanUseFundOut> queryFundListByBudgetId(@RequestParam Long budgetInfoId) {
return ok(ResponseCode.SUCCESS, fundQueryService.queryFundListByBudgetId(budgetInfoId));
}
@@ -143,14 +144,14 @@ public class FundController extends BaseController implements IFund {
* @param response 鍝嶅簲
*/
@ApiOperation("1-5.瀵煎嚭缁忔祹绉戠洰")
- @Override
+ @PostMapping(path = "/exportFund")
public Result<Object> exportFund(HttpServletRequest request, HttpServletResponse response) {
fundQueryService.exportFund(request,response);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("1-6.鑾峰彇鍏敤缁忚垂鐨勭粡娴庣鐩�")
- @Override
+ @PostMapping(path = "/queryDailyFund")
public Result<FundOut> queryDailyFund() {
return ok(ResponseCode.SUCCESS, fundQueryService.queryDailyFund());
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundTemplateLimitController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundTemplateLimitController.java
index 9d518de11f5dc700e2df9084093bab5bdec3ee5e..5b82d78b255d1e0bdf21194a0f80cb6b9529ba5a 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundTemplateLimitController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/FundTemplateLimitController.java
@@ -10,6 +10,7 @@ import com.seasky.projectplan.dto.fundTemplateLimit.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -38,7 +39,7 @@ public class FundTemplateLimitController extends BaseController implements IFund
* @return {@link Result}<{@link TemplateOut}>
*/
@ApiOperation("鑾峰彇鎸囨爣妯℃澘鍒楄〃")
- @Override
+ @PostMapping(path = "/listBusinessTemplate")
public Result<TemplateOut> listBusinessTemplate(@RequestBody FundTemplateQuery fundTemplateQuery) {
List<TemplateOut> templateOuts = fundTemplateLimitQuerySvr.listBusinessTemplate(fundTemplateQuery);
return ok(ResponseCode.SUCCESS,templateOuts);
@@ -50,7 +51,7 @@ public class FundTemplateLimitController extends BaseController implements IFund
* @return {@link Result}<{@link FundOut}>
*/
@ApiOperation("鏍规嵁妯℃澘鏌ヨ缁忔祹绉戠洰鎵€瀵瑰簲鐨勯搴�")
- @Override
+ @PostMapping(path = "/queryFundByYear")
public Result<FundLimitOut> queryFundByYear(@RequestParam(value = "templateCode") String templateCode) {
List<FundLimitOut> fundLimitOutList = fundTemplateLimitQuerySvr.queryFundByYear(templateCode);
return ok(ResponseCode.SUCCESS,fundLimitOutList);
@@ -63,7 +64,7 @@ public class FundTemplateLimitController extends BaseController implements IFund
* @return {@link Result}<{@link ControlsOut}>
*/
@ApiOperation("閫氳繃妯℃澘缂栧彿鏌ラ搴︿俊鎭�")
- @Override
+ @PostMapping(path = "/queryLimitByTemplateCode")
public Result<ControlsOut> queryLimitByTemplateCode(@RequestParam(value = "templateCode") String templateCode) {
List<ControlsOut> controlsOuts = fundTemplateLimitQuerySvr.queryLimitByTemplateCode(templateCode);
return ok(ResponseCode.SUCCESS,controlsOuts);
@@ -76,7 +77,7 @@ public class FundTemplateLimitController extends BaseController implements IFund
* @return {@link Result}<{@link Long}>
*/
@ApiOperation("淇濆瓨缁忔祹绉戠洰妯℃澘淇℃伅")
- @Override
+ @PostMapping(path = "/saveFundTemplate")
public Result<Long> saveFundTemplate(@RequestBody List<FundTemplateCmd> fundTemplateCmdList) {
return ok(ResponseCode.SUCCESS,fundTemplateLimitSvr.saveFundTemplate(fundTemplateCmdList));
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java
index fbd056feda5baa7cc0b351ced1f2bcf66101e8df..b0c42e453dfaded8895a7835b3d08f7fe1a22708 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/InComePlanController.java
@@ -18,6 +18,7 @@ import com.seasky.projectplan.dto.incomeplan.*;
import com.seasky.projectplan.dto.projectplan.ActionFlowCmd;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -55,7 +56,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<Integer>}
*/
@ApiOperation("1.鏂板鎴栦慨鏀规敹鍏ョ紪鍒朵功锛堝叓椤癸級")
- @Override
+ @PostMapping(path = "/saveInComePlan")
public Result<Long> saveInComePlan(@RequestBody InComePlanCmd inComePlanCmd) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.saveInComePlan(inComePlanCmd));
}
@@ -67,7 +68,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<Integer>}
*/
@ApiOperation("1.鏂板鎴栦慨鏀规敹鍏ョ紪鍒朵功锛堝叾浠栵級")
- @Override
+ @PostMapping(path = "/saveInComeSubPlan")
public Result<Long> saveInComeSubPlan(@RequestBody InComePlanSubCmd inComePlanCmd) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.saveInComeSubPlan(inComePlanCmd));
}
@@ -79,37 +80,37 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<Integer>}
*/
@ApiOperation("2.閫昏緫鍒犻櫎鏀跺叆缂栧埗涔�")
- @Override
+ @PostMapping(path = "/removeInComePlan")
public Result<Integer> removeInComePlan(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.removeInComePlan(ids));
}
@ApiOperation("3.鎻愪氦椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/submitInComePlan")
public Result<Integer> submitInComePlan(@RequestBody ActionFlowCmd actionFlowCmd) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.submitInComePlan(actionFlowCmd));
}
@ApiOperation("4.閫€鍥為」鐩敵鎶ヤ功")
- @Override
+ @PostMapping(path = "/rollBackInComePlan")
public Result<Integer> rollBackInComePlan(@RequestBody ActionFlowCmd actionFlowCmd) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.rollBackInComePlan(actionFlowCmd));
}
@ApiOperation("5.鎾ゅ洖椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/reCallInComePlan")
public Result<Integer> reCallInComePlan(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.reCallInComePlan(id));
}
@ApiOperation("6.鎵归噺鎻愪氦椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/submitInComePlanList")
public Result<Integer> submitInComePlanList(@RequestBody List<ActionFlowCmd> list) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.submitInComePlanList(list));
}
@ApiOperation("7.鎵归噺閫€鍥為」鐩敵鎶ヤ功")
- @Override
+ @PostMapping(path = "/rollBackInComePlanList")
public Result<Integer> rollBackInComePlanList(@RequestBody List<ActionFlowCmd> list) {
return ok(ResponseCode.SUCCESS, inComePlanSvr.rollBackInComePlanList(list));
}
@@ -122,7 +123,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-1.鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄨ幏鍙栧叾閮ㄩ棬鐨勬敹鍏ョ紪鍒朵俊鎭甫鍒嗛〉")
- @Override
+ @PostMapping(path = "/queryInComePlanPageByCurrentUserDept")
public Result<InComePlanOut> queryInComePlanPageByCurrentUserDept(@RequestBody IncomeplanQry qry) {
return ok(ResponseCode.SUCCESS, inComePlanService.queryInComePlanPageByCurrentUserDept(qry));
}
@@ -133,7 +134,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-2.鏍规嵁ID鏌ヨ鏀跺叆缂栧埗淇℃伅")
- @Override
+ @PostMapping(path = "/queryInComeById")
public Result<InComePlanOut> queryInComeById(@RequestBody IncomeplanQry qry) {
return ok(ResponseCode.SUCCESS, inComePlanService.queryInComeById(qry));
}
@@ -144,7 +145,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-3.杩斿洖鏀跺叆绫诲瀷鐨勬灇涓鹃泦鍚�")
- @Override
+ @PostMapping(path = "/queryInComeTypeEnumList")
public Result<InComePlanOut> queryInComeTypeEnumList() {
return ok(ResponseCode.SUCCESS, inComePlanService.queryInComeTypeEnumList());
}
@@ -155,7 +156,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-4.鏄剧ず鎵€鏈夌殑鏀跺叆缂栧埗淇℃伅甯﹀垎椤�")
- @Override
+ @PostMapping(path = "/queryInComePlanPage")
public Result<InComePlanOut> queryInComePlanPage(@RequestBody IncomeplanQry qry) {
return ok(ResponseCode.SUCCESS, inComePlanService.queryInComePlanPage(qry));
}
@@ -166,7 +167,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("2-1.鏀跺叆瀹℃壒鏌ヨ")
- @Override
+ @PostMapping(path = "/queryInComePlanApprovalPage")
public Result<InComePlanOut> queryInComePlanApprovalPage(@RequestBody IncomeplanApprovalQry qry) {
if (ObjectUtil.isNull(qry.getProcessKey()) || "".equals(qry.getProcessKey())) {
qry.setProcessKey("shouru");
@@ -180,7 +181,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("2-2.鏀跺叆鐩戞帶鏌ヨ")
- @Override
+ @PostMapping(path = "/queryInComePlanMonitorPage")
public Result<InComePlanOut> queryInComePlanMonitorPage(@RequestBody IncomeplanMonitorQry qry) {
return ok(ResponseCode.SUCCESS, inComePlanService.queryInComePlanMonitorPage(qry));
}
@@ -191,7 +192,7 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @return {@link Result<FundOut>}
*/
@ApiOperation("1-5.杩斿洖瀛︾敓鏀跺叆绫诲瀷鐨勬灇涓鹃泦鍚�")
- @Override
+ @PostMapping(path = "/queryStudentTypeEnumList")
public Result<InComePlanOut> queryStudentTypeEnumList() {
return ok(ResponseCode.SUCCESS, inComePlanService.queryStudentTypeEnumList());
}
@@ -204,13 +205,13 @@ public class InComePlanController extends BaseController implements IInComePlanC
* @param qry qry
*/
@ApiOperation("3-1.瀵煎嚭鏀跺叆淇℃伅")
- @Override
+ @PostMapping(path = "/exportInComePlan")
public void exportInComePlan(HttpServletRequest request, HttpServletResponse response, @RequestBody IncomeplanMonitorQry qry) {
inComePlanService.exportInComePlan(request, response, qry);
}
@ApiOperation("1.鍚屾涓€涓婃敹鍏�")
- @Override
+ @PostMapping("/syncOneUpIncome")
public Result<Object> syncOneUpIncome(@RequestParam Integer year) {
inComePlanSvr.syncOneUpIncome(year);
return ok(ResponseCode.SUCCESS);
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PartyNumberController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PartyNumberController.java
index 9b16e19f61c4b0281075f6136ec8306a5ef79532..bae386789c8e350b2e0a62836203f0326feefa93 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PartyNumberController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PartyNumberController.java
@@ -10,6 +10,7 @@ import com.seasky.projectplan.dto.partyNumber.PartyNumberOut;
import com.seasky.projectplan.dto.partyNumber.PartyNumberQry;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -38,76 +39,46 @@ public class PartyNumberController extends BaseController implements IPartyNumbe
@Resource
private PartyNumberQuerySvr partyNumberQuerySvr;
- /**
- * 淇濆瓨鍏氬憳浜烘暟
- *
- * @param partyNumberCmd 鏂规暟cmd
- * @return {@link Result}<{@link Long}>
- */
@ApiOperation("1.淇濆瓨鍏氬憳浜烘暟")
- @Override
+ @PostMapping(path = "/savePartyNumber")
public Result<Long> savePartyNumber(@RequestBody PartyNumberCmd partyNumberCmd) {
return ok(ResponseCode.SUCCESS,partyNumberSvr.savePartyNumber(partyNumberCmd));
}
- /**
- * 鍒犻櫎鍏氬憳浜烘暟
- *
- * @param ids id
- * @return {@link Result}<{@link Integer}>
- */
@ApiOperation("2.鍒犻櫎鍏氬憳浜烘暟")
- @Override
+ @PostMapping(path = "/removePartyNumber")
public Result<Integer> removePartyNumber(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS,partyNumberSvr.removePartyNumber(ids));
}
- /**
- * 鍒嗛〉鏌ヨ鍏氬憳浜烘暟淇℃伅
- *
- * @param partyNumberQry 鏂规暟qry
- * @return {@link Result}<{@link PartyNumberOut}>
- */
@ApiOperation("3.鍒嗛〉鏌ヨ鍏氬憳浜烘暟淇℃伅")
- @Override
+ @PostMapping(path = "/queryPartyNumber")
public Result<PartyNumberOut> queryPartyNumber(@RequestBody PartyNumberQry partyNumberQry) {
return ok(ResponseCode.SUCCESS,partyNumberQuerySvr.queryPartyList(partyNumberQry));
}
- /**
- * 鏍规嵁id鏌ヨ鍏氬憳浜烘暟淇℃伅
- *
- * @param id id
- * @return {@link Result}<{@link PartyNumberOut}>
- */
@ApiOperation("4.鏍规嵁id鏌ヨ鍏氬憳浜烘暟淇℃伅")
- @Override
+ @PostMapping(path = "/queryPartyNumberById")
public Result<PartyNumberOut> queryPartyNumberById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS,partyNumberQuerySvr.queryPartyNumberById(id));
}
- /**
- * 涓嬭浇 鍏氬憳浜烘暟淇℃伅 瀵煎叆妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
@ApiOperation("5.涓嬭浇鍏氬憳浜烘暟淇℃伅瀵煎叆妯℃澘")
- @Override
+ @PostMapping(path = "/downLoadPartyNumberTemplate")
public Result<Object> downLoadPartyNumberTemplate(HttpServletRequest request, HttpServletResponse response) {
partyNumberQuerySvr.downLoadPartyNumberTemplate(request,response);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("6.瀵煎嚭鍏氬憳浜烘暟淇℃伅")
- @Override
+ @PostMapping(path = "/exportPartyNumberInformation")
public Result<Object> exportPartyNumberInformation(HttpServletRequest request, HttpServletResponse response) {
partyNumberQuerySvr.exportPartyNumberInformation(request,response);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("7.瀵煎叆鍏氬憳浜烘暟淇℃伅")
- @Override
+ @PostMapping(path = "/importPartyNumber")
public Result<Object> importPartyNumber(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
partyNumberSvr.importPartyNumber(request,response,file);
return ok(ResponseCode.SUCCESS);
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java
index 0b585d67b4228c76428b14e825c7eccfbe678475..7ecb3cebbaf2c22daa3d4130ba5a3a7d90117ffb 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PredictionController.java
@@ -8,6 +8,7 @@ import com.seasky.projectplan.application.query.prediction.QueryYBInfoService;
import com.seasky.projectplan.dto.projectplan.quotadeclaration.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -31,39 +32,20 @@ public class PredictionController extends BaseController implements IPredictionC
@Resource
SaveYBKZMoneySvr saveYBKZMoneySvr;
-
- /**
- * 鏌ヨ鎵€鏈変簩涓婇€氳繃瀹℃牳鐨勭紪鍒朵功
- *
- * @param projectPlanBookQry 椤圭洰瑙勫垝涔md
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @Override
+ @PostMapping("/queryYBInfo")
@ApiOperation("鏌ヨ鎵€鏈変簩涓婇€氳繃瀹℃牳鐨勭紪鍒朵功")
public Result<ProjectPlanBookOut> queryYBInfo(@RequestBody ProjectPlanBookQry projectPlanBookQry) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.queryYBInfo(projectPlanBookQry));
}
- /**
- * 淇濆瓨棰勬嫧璁惧畾锛堝崟涓級
- *
- * @param predictionKZMoneyCmd 棰勬祴kzmoney cmd
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/saveYBKZMoney")
@ApiOperation("淇濆瓨棰勬嫧璁惧畾锛堝崟涓級")
public Result<Object> saveYBKZMoney(@RequestBody PredictionKZMoneyCmd predictionKZMoneyCmd) {
saveYBKZMoneySvr.saveYBKZMoney(predictionKZMoneyCmd);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 淇濆瓨棰勬嫧璁惧畾锛堝涓級
- *
- * @param predictionKZMoneyCmdList 棰勬祴kzmoney cmd
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/saveYBKZMoneyList")
@ApiOperation("淇濆瓨棰勬嫧璁惧畾锛堝涓級")
public Result<Object> saveYBKZMoneyList(@RequestBody List<PredictionKZMoneyCmd> predictionKZMoneyCmdList) {
for (PredictionKZMoneyCmd predictionKZMoneyCmd : predictionKZMoneyCmdList) {
@@ -72,137 +54,71 @@ public class PredictionController extends BaseController implements IPredictionC
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘煡璇簩涓婂鏍稿畬鎴愮殑椤圭洰淇℃伅锛堥鎷ㄧ敵璇凤級
- *
- * @param projectPlanBookQry 椤圭洰瑙勫垝涔ry
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @Override
+ @PostMapping("/queryYBInfoByCurUser")
@ApiOperation("鏍规嵁褰撳墠鐧诲綍浜烘煡璇簩涓婂鏍稿畬鎴愮殑椤圭洰淇℃伅锛堥鎷ㄧ敵璇凤級")
public Result<ProjectPlanBookOut> queryYBInfoByCurUser(@RequestBody ProjectPlanBookQry projectPlanBookQry) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.queryYBInfoByCurUser(projectPlanBookQry));
}
- /**
- * 鏍规嵁projectplanbookid鑾峰彇琛ㄥ崟涓墍闇€瑕佺殑淇℃伅
- *
- * @param projectPlanBookId 椤圭洰瑙勫垝涔d
- * @return {@link Result}<{@link ProjectPlanBookOut}>
- */
- @Override
+ @PostMapping("/queryBYById")
@ApiOperation("鏍规嵁projectplanbookid鑾峰彇琛ㄥ崟涓墍闇€瑕佺殑淇℃伅")
public Result<ProjectOut> queryBYById(Long projectPlanBookId) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.queryBYById(projectPlanBookId));
}
- /**
- * 淇濆瓨棰勬嫧琛ㄥ崟
- *
- * @param projectCmd 椤圭洰cmd
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/saveByBook")
@ApiOperation("淇濆瓨棰勬嫧琛ㄥ崟")
public Result<Object> saveByBook(@RequestBody ProjectCmd projectCmd) {
return ok(ResponseCode.SUCCESS, saveYBKZMoneySvr.saveByBook(projectCmd));
}
- /**
- * 鎻愪氦棰勬嫧
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/SubmitQuotaDeclaration")
@ApiOperation("鎻愪氦棰勬嫧")
public Result<Object> SubmitQuotaDeclaration(@RequestBody ActionFlowCmd actionFlowCmd) {
saveYBKZMoneySvr.SubmitQuotaDeclaration(actionFlowCmd);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鍥炴粴棰勬嫧
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/rollBackQuotaDeclaration")
@ApiOperation("鍥炴粴棰勬嫧")
public Result<Object> rollBackQuotaDeclaration(@RequestBody ActionFlowCmd actionFlowCmd) {
saveYBKZMoneySvr.rollBackQuotaDeclaration(actionFlowCmd);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鍥炴挙棰勬嫧
- *
- * @param id 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/recallQuotaDeclaration")
@ApiOperation("鍥炴挙棰勬嫧")
public Result<Object> recallQuotaDeclaration(Long id) {
saveYBKZMoneySvr.recallQuotaDeclaration(id);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鏍规嵁棰勭畻缂栧埗涔︾殑ID鏌ヨ鍘嗗彶鐢宠琛ㄤ俊鎭�,鍒嗛〉
- *
- * @param ybHisInfoQry yb qry浠栦俊鎭�
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/queryYBHisInfoById")
@ApiOperation("鏍规嵁棰勭畻缂栧埗涔︾殑ID鏌ヨ鍘嗗彶鐢宠琛ㄤ俊鎭�,鍒嗛〉")
public Result<YBHisInfoOut> queryYBHisInfoById(@RequestBody YBHisInfoQry ybHisInfoQry) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.queryYBHisInfoById(ybHisInfoQry));
}
- /**
- * 鏄剧ず褰撳墠鐧诲綍浜烘墍闇€瑕佸鏍哥殑淇℃伅锛屽垎椤�
- *
- * @param ybExamineCmd yb妫€鏌md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/queryYBExamine")
@ApiOperation("鏄剧ず褰撳墠鐧诲綍浜烘墍闇€瑕佸鏍哥殑淇℃伅锛屽垎椤�")
public Result<YBExamineOut> queryYBExamine(@RequestBody YBExamineCmd ybExamineCmd) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.queryYBExamine(ybExamineCmd));
}
- /**
- * 鏍规嵁鏂板缓琛╥d鑾峰彇琛ㄥ崟涓墍鏈夌殑淇℃伅
- *
- * @param id id
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/getBYById")
@ApiOperation("鏍规嵁鏂板缓琛╥d鑾峰彇琛ㄥ崟涓墍鏈夌殑淇℃伅")
public Result<ProjectOut> getBYById(Long id) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.getBYById(id));
}
- /**
- * 鍒犻櫎鍘嗗彶yb
- *
- * @param id 椤圭洰瑙勫垝涔d
- * @return {@link Result}<{@link ProjectOut}>
- */
- @Override
+ @PostMapping("/deleteHistoryYB")
@ApiOperation("鏍规嵁棰勬嫧琛↖d鍒犻櫎鍘嗗彶鎷ㄦ淇℃伅")
public Result<Object> deleteHistoryYB(Long id) {
saveYBKZMoneySvr.deleteHistoryYB(id);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鍒ゆ柇鏄惁绔嬮」
- *
- * @param projectNo 椤圭洰娌℃湁
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/judge")
@ApiOperation("鍒ゆ柇鏄惁绔嬮」")
public Result<Object> judge(String projectNo) {
return ok(ResponseCode.SUCCESS, queryYBInfoService.judge(projectNo));
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java
index 72058267200ad39663a166125b037e82ddb6b17e..373f5d4ef54536c75d0daedfe2cbcf12d15feb5a 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectLibraryController.java
@@ -10,6 +10,7 @@ import com.seasky.projectplan.dto.projectplan.ProjectPlanBookOut;
import com.seasky.projectplan.infrastructure.aop.BeanTrim;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -35,13 +36,13 @@ public class ProjectLibraryController implements IProjectLibrary {
@Resource
ProjectLibraryQuerySvr querySvr;
- @Override
+ @PostMapping("/queryProjectPlanBookIdByProjectTypeId")
@ApiOperation("鎸夐」鐩被鍨媔d鏌ヨ椤圭洰璁″垝涔d")
public Result<ProjectPlanBookOut> queryProjectPlanBookIdByProjectTypeId(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS,querySvr.queryProjectPlanBookIdByProjectTypeId(id));
}
- @Override
+ @PostMapping("/saveProjectLibrary")
@ApiOperation("1.鏂板淇敼椤圭洰")
public Result<Object> saveProjectLibrary(@RequestBody ProjectLibraryCmd cmd) {
service.saveProjectLibrary(cmd);
@@ -49,48 +50,48 @@ public class ProjectLibraryController implements IProjectLibrary {
}
@ApiOperation("鍒犻櫎椤圭洰搴撲俊鎭�")
- @Override
+ @PostMapping("/removeProjectLibrary")
public Result<Object> removeProjectLibrary(@RequestBody List<Long> idList) {
service.removeProjectLibrary(idList);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/copyHistoryProjectLibrary")
@ApiOperation("2.鎷疯礉鍘嗗彶椤圭洰浣滀负鏈勾椤圭洰搴撲俊鎭�")
public Result<Object> copyHistoryProjectLibrary(@RequestBody List<Long> idList) {
service.copyHistoryProjectLibrary(idList);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/enterProjectPlanType1")
@ApiOperation("3.椤圭洰缁忚垂杩涘叆涓€涓�")
public Result<Object> enterProjectPlanType1(@RequestParam Long id) {
service.enterProjectPlanType1(id);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/enterAllProjectPlanType1")
@ApiOperation("13.椤圭洰搴撳鏍稿畬鎴愭墍鏈夋湭杩涘叆涓€涓婄殑椤圭洰杩涘叆涓€涓�")
public Result<Object> enterAllProjectPlanType1() {
service.enterAllProjectPlanType1();
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/enterProjectPlanType2")
@ApiOperation("4.椤圭洰缁忚垂杩涘叆浜屼笂")
public Result<Object> enterProjectPlanType2(@RequestParam Long id) {
service.enterProjectPlanType2(id);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/enterPiFuProjectPlan")
@ApiOperation("杩涘叆鎵瑰")
public Result<Object> enterPiFuProjectPlan(@RequestParam Long id) {
service.enterPiFuProjectPlan(id);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/enterPiFuAllProjectPlan")
@ApiOperation("浜屼笂瀹℃牳瀹屾垚鐨勮繘鍏ユ壒澶�")
public Result<Boolean> enterPiFuAllProjectPlan() {
service.enterPiFuAllProjectPlan();
@@ -98,77 +99,77 @@ public class ProjectLibraryController implements IProjectLibrary {
}
@ApiOperation("5.鍙栨秷杩涘叆涓€涓�")
- @Override
+ @PostMapping("/cancelEnterProjectPlanType1")
public Result<Object> cancelEnterProjectPlanType1(@RequestParam Long id) {
service.cancelEnterProjectPlanType1(id);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("6.鍙栨秷杩涘叆浜屼笂")
- @Override
+ @PostMapping("/cancelEnterProjectPlanType2")
public Result<Object> cancelEnterProjectPlanType2(@RequestParam Long id) {
service.cancelEnterProjectPlanType2(id);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("鍙栨秷杩涘叆鎵瑰")
- @Override
+ @PostMapping("/cancelEnterPiFuProjectPlan")
public Result<Object> cancelEnterPiFuProjectPlan(@RequestParam Long id) {
service.cancelEnterPiFuProjectPlan(id);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("8.鍒嗛〉鏄剧ず椤圭洰搴撲俊鎭�")
- @Override
+ @PostMapping("/queryProjectLibraryPage")
public Result<ProjectLibraryOut> queryProjectLibraryPage(@RequestBody ProjectLibraryQry qry) {
return ok(ResponseCode.SUCCESS, querySvr.queryProjectLibraryPage(qry));
}
@ApiOperation("9.鏍规嵁鐧诲綍浜烘墍鍦ㄧ殑閮ㄩ棬闆嗗悎鑾峰彇鍏舵墍鏈夌殑椤圭洰搴撲俊鎭�(鍒嗛〉鏄剧ず)")
- @Override
+ @PostMapping("/queryProjectLibraryPageByCurrentUserDept")
public Result<ProjectLibraryOut> queryProjectLibraryPageByCurrentUserDept(@RequestBody ProjectLibraryQry qry) {
return ok(ResponseCode.SUCCESS, querySvr.queryProjectLibraryPageByCurrentUserDept(qry));
}
@ApiOperation("10.鑾峰彇鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑鍘嗗彶骞村害鐨勯」鐩簱淇℃伅(鍒嗛〉鏄剧ず)")
- @Override
+ @PostMapping("/queryHistoryProjectLibraryPageByCurrentUserDept")
public Result<ProjectLibraryOut> queryHistoryProjectLibraryPageByCurrentUserDept(@RequestBody ProjectLibraryQry qry) {
return ok(ResponseCode.SUCCESS, querySvr.queryHistoryProjectLibraryPageByCurrentUserDept(qry));
}
@ApiOperation("11.鑾峰彇椤圭洰搴撲笅鎷夋")
- @Override
+ @PostMapping("/getPlanTypeEnum")
public Result<PlanTypeEnumOut> getPlanTypeEnum() {
return ok(ResponseCode.SUCCESS, querySvr.getPlanTypeEnum());
}
@ApiOperation("12.鑾峰彇褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑涓€涓嬮」鐩粡璐规牳瀹氭暟")
- @Override
+ @PostMapping("/queryQuotaMoney")
public Result<String> queryQuotaMoney(@RequestParam Integer year) {
return ok(ResponseCode.SUCCESS, querySvr.queryQuotaMoney(year));
}
@ApiOperation("鑾峰彇褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑涓€涓嬫棩甯告牳瀹氭暟")
- @Override
+ @PostMapping("/queryRiChangQuotaMoney")
public Result<String> queryRiChangQuotaMoney(@RequestParam Integer year) {
return ok(ResponseCode.SUCCESS, querySvr.queryRiChangQuotaMoney(year));
}
@ApiOperation("14.浜哄憳缁忚垂杩涘叆浜屼笂")
- @Override
+ @PostMapping("/enterPersonProjectPlan")
public Result<Object> enterPersonProjectPlan(@RequestParam Integer year) {
service.enterPersonProjectPlanType2(year);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/enterPublicProjectPlan")
@ApiOperation("15.鍏敤缁忚垂杩涘叆浜屼笂")
public Result<Object> enterPublicProjectPlan() {
service.enterPublicProjectPlanType2();
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/syncPiFuPublicProjectPlan")
@ApiOperation("鍚屾鏃ュ父鍏敤缁忚垂杩涘叆鎵瑰")
public Result<Object> syncPiFuPublicProjectPlan() {
service.syncPiFuPublicProjectPlan();
@@ -176,55 +177,55 @@ public class ProjectLibraryController implements IProjectLibrary {
}
- @Override
+ @PostMapping("/enterPiFuPublicProjectPlan")
@ApiOperation("鍏敤缁忚垂杩涘叆鎵瑰")
public Result<Object> enterPiFuPublicProjectPlan(@RequestBody List<Long> idList) {
service.enterPiFuPublicProjectPlan(idList);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/getProjectLibrary")
@ApiOperation("鏌ヨ椤圭洰搴撳熀鏈睘鎬zy锛屽崟涓�")
public Result<ProjectPlanBookOut> getProjectLibrary(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, querySvr.getProjectLibrary(id));
}
- @Override
+ @PostMapping("/listProjectLibraryGzy")
@ApiOperation("鍒嗛〉鏌ヨ鐢虫姤淇℃伅gzy")
@BeanTrim
public Result<ProjectLibraryOut> listProjectLibraryGzy(ProjectLibraryQry qry) {
return ok(ResponseCode.SUCCESS, querySvr.listProjectLibraryGzy(qry));
}
- @Override
+ @PostMapping("/listProjectLibraryGzyChange")
@ApiOperation("閮ㄩ棬棰勭畻椤圭洰搴撴煡璇紙鐢虫姤搴撱€佸偍澶囧簱銆佸畬缁撳簱锛�")
@BeanTrim
public Result<ProjectLibraryAndBudgetInfoOut> listProjectLibraryGzyChange(ProjectLibraryQry qry) {
return ok(ResponseCode.SUCCESS, querySvr.listProjectLibraryGzyChange(qry));
}
- @Override
+ @PostMapping("/projectStateSuccess")
@ApiOperation("瀹岀粨椤圭洰")
public Result<Boolean> projectStateSuccess(@RequestBody List<Long> idList) {
service.projectStateSuccess(idList);
return ok(ResponseCode.SUCCESS,Boolean.TRUE);
}
- @Override
+ @PostMapping("/projectStateBreak")
@ApiOperation("涓椤圭洰")
public Result<Boolean> projectStateBreak(@RequestBody List<Long> idList) {
service.projectStateBreak(idList);
return ok(ResponseCode.SUCCESS,Boolean.TRUE);
}
- @Override
+ @PostMapping("/projectStateStart")
@ApiOperation("鍦ㄥ缓椤圭洰")
public Result<Boolean> projectStateStart(@RequestBody List<Long> idList) {
service.projectStateStart(idList);
return ok(ResponseCode.SUCCESS,Boolean.TRUE);
}
- @Override
+ @PostMapping("/projectStateInit")
@ApiOperation("鍒濆鍖栭」鐩�")
public Result<Boolean> projectStateInit(@RequestBody List<Long> idList) {
service.projectStateInit(idList);
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
index 5f86a4831bab3a74e7a2fd32177fce3e87beda70..17a0764f0a3c1756d0d7d4850220847426af9e90 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
@@ -13,6 +13,7 @@ import com.seasky.projectplan.dto.projectplan.projectTypeOut.ProjectTypeOut;
import com.seasky.projectplan.dto.projectplan.projectTypeOut.ProjectTypeQry;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -43,79 +44,79 @@ public class ProjectPlanController extends BaseController implements IProjectPla
private ProjectPlanQueryService queryService;
@ApiOperation("鏍规嵁鐢虫姤闃舵鏌ヨ椤圭洰绫诲瀷")
- @Override
+ @PostMapping(path = "/queryProjectTypeByPlanType")
public Result<ProjectTypeOut> queryProjectTypeByPlanType(@RequestBody ProjectTypeQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS,queryService.queryProjectTypeByPlanType(projectInfoPlanQry));
}
@ApiOperation("1.淇濆瓨椤圭洰缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/saveProjectInfoPlan")
public Result<Long> saveProjectInfoPlan(@RequestBody ProjectPlanBookCmd projectPlanBookCmd) {
return ok(ResponseCode.SUCCESS, commandSvr.saveProjectInfoPlan(projectPlanBookCmd));
}
@ApiOperation("2.淇濆瓨鏃ュ父缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/saveProjectDailyPlan")
public Result<Long> saveProjectDailyPlan(@RequestBody ProjectPlanBookCmd projectPlanBookCmd) {
return ok(ResponseCode.SUCCESS, commandSvr.saveProjectDailyPlan(projectPlanBookCmd));
}
@ApiOperation("3.淇濆瓨浜哄憳缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/saveProjectPersonPlan")
public Result<Long> saveProjectPersonPlan(@RequestBody ProjectPlanBookCmd projectPlanBookCmd) {
return ok(ResponseCode.SUCCESS, commandSvr.saveProjectPersonPlan(projectPlanBookCmd));
}
@ApiOperation("4.鍒犻櫎椤圭洰缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/removeProjectInfoPlan")
public Result<Integer> removeProjectInfoPlan(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, commandSvr.removeProjectInfoPlan(ids));
}
@ApiOperation("5.鍒犻櫎鏃ュ父缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/removeProjectDailyPlan")
public Result<Integer> removeProjectDailyPlan(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, commandSvr.removeProjectDailyPlan(ids));
}
@ApiOperation("6.鍒犻櫎浜哄憳缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/removeProjectPersonPlan")
public Result<Integer> removeProjectPersonPlan(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, commandSvr.removeProjectPersonPlan(ids));
}
@ApiOperation("7.鎻愪氦椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/submitProjectPlan")
public Result<Integer> submitProjectPlan(@RequestBody ActionFlowCmd actionFlowCmd) {
return ok(ResponseCode.SUCCESS, commandSvr.submitProjectPlan(actionFlowCmd));
}
@ApiOperation("8.閫€鍥為」鐩敵鎶ヤ功")
- @Override
+ @PostMapping(path = "/rollBackProjectPlan")
public Result<Integer> rollBackProjectPlan(@RequestBody ActionFlowCmd actionFlowCmd) {
return ok(ResponseCode.SUCCESS, commandSvr.rollBackProjectPlan(actionFlowCmd));
}
@ApiOperation("9.鎾ゅ洖椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/reCallProjectPlan")
public Result<Integer> reCallProjectPlan(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, commandSvr.reCallProjectPlan(id));
}
@ApiOperation("10.鎵归噺鎻愪氦椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/submitProjectPlanList")
public Result<Integer> submitProjectPlanList(@RequestBody List<ActionFlowCmd> list) {
return ok(ResponseCode.SUCCESS, commandSvr.submitProjectPlanList(list));
}
@ApiOperation("11.鎵归噺閫€鍥為」鐩敵鎶ヤ功")
- @Override
+ @PostMapping(path = "/rollBackProjectPlanList")
public Result<Integer> rollBackProjectPlanList(@RequestBody List<ActionFlowCmd> list) {
return ok(ResponseCode.SUCCESS, commandSvr.rollBackProjectPlanList(list));
}
@ApiOperation("12.鍥哄畾鎵归噺鎻愪氦椤圭洰鐢虫姤涔﹁嚦瀹℃牳瀹屾垚")
- @Override
+ @PostMapping(path = "/submitProjectPlanListToFinish")
public Result<Integer> submitProjectPlanListToFinish(@RequestBody List<Long> idList) {
return ok(ResponseCode.SUCCESS, commandSvr.submitProjectPlanListToFinish(idList));
}
@@ -123,176 +124,129 @@ public class ProjectPlanController extends BaseController implements IProjectPla
//浠ヤ笅 Q绾�
@ApiOperation("Q1.鏍规嵁ID 鑾峰彇椤圭洰缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�)")
- @Override
+ @PostMapping(path = "/queryProjectInfoPlanById")
public Result<ProjectPlanBookOut> queryProjectInfoPlanById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanById(id));
}
@ApiOperation("鏌ヨ鍘嗗彶椤圭洰璁″垝涔�")
- @Override
+ @PostMapping(path = "/queryHistoryProjectPlanBook")
public Result<ProjectPlanBookOut> queryHistoryProjectPlanBook(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryHistoryProjectPlanBook(projectInfoPlanQry));
}
@ApiOperation("Q2.鏍规嵁ID 鑾峰彇鏃ュ父缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�)")
- @Override
+ @PostMapping(path = "/queryProjectDailyPlanById")
public Result<ProjectPlanBookOut> queryProjectDailyPlanById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectDailyPlanById(id));
}
@ApiOperation("Q3.鏍规嵁ID 鑾峰彇浜哄憳缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�)")
- @Override
+ @PostMapping(path = "/queryProjectPersonPlanById")
public Result<ProjectPlanBookOut> queryProjectPersonPlanById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectPersonPlanById(id));
}
@ApiOperation("Q4.閮ㄩ棬棰嗗瀹℃壒 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栭」鐩粡璐归泦鍚堬紙鍒嗛〉锛�")
- @Override
+ @PostMapping(path = "/queryProjectInfoPlanPageByCurrentUserDept")
public Result<ProjectPlanBookOut> queryProjectInfoPlanPageByCurrentUserDept(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanPageByCurrentUserDept(projectInfoPlanQry));
}
@ApiOperation("Q4-2.鍒嗙鏍￠瀵煎鎵� 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栭」鐩粡璐归泦鍚� 锛堝垎椤碉級")
- @Override
+ @PostMapping(path = "/queryProjectInfoPlanPageByCurrentUserRelevantDept")
public Result<ProjectPlanBookOut> queryProjectInfoPlanPageByCurrentUserRelevantDept(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanPageByCurrentUserRelevantDept(projectInfoPlanQry));
}
@ApiOperation("Q5.鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栨棩甯哥粡璐归泦鍚堬紙鍒嗛〉锛�")
- @Override
+ @PostMapping(path = "/queryProjectDailyPlanByCurrentUserDept")
public Result<ProjectPlanBookOut> queryProjectDailyPlanByCurrentUserDept(@RequestBody ProjectDailyPlanQry projectDailyPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectDailyPlanByCurrentUserDept(projectDailyPlanQry));
}
@ApiOperation("Q6.鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栦汉鍛樼粡璐归泦鍚堬紙鍒嗛〉锛�")
- @Override
+ @PostMapping(path = "/queryProjectPersonPlanByCurrentUserDept")
public Result<ProjectPlanBookOut> queryProjectPersonPlanByCurrentUserDept(@RequestBody ProjectPersonPlanQry projectPersonPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectPersonPlanByCurrentUserDept(projectPersonPlanQry));
}
@ApiOperation("Q7.鏍规嵁椤圭洰绫诲瀷鑾峰彇璇ョ被鍨嬬殑鎵€鏈夐」鐩�(鍒嗛〉)")
- @Override
+ @PostMapping(path = "/queryProjectInfoPlanPageByProjectType")
public Result<ProjectPlanBookOut> queryProjectInfoPlanPageByProjectType(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanPageByProjectType(projectInfoPlanQry));
}
@ApiOperation("Q8.褰掑彛閮ㄩ棬瀹℃壒 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄧ殑閮ㄩ棬闆嗗悎鎵€鎷ユ湁鐨勯」鐩被鍨嬫墍鏈夐」鐩俊鎭�")
- @Override
+ @PostMapping(path = "/queryProjectInfoPlanPageByOwnCurrentUserDept")
public Result<ProjectPlanBookOut> queryProjectInfoPlanPageByOwnCurrentUserDept(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanPageByOwnCurrentUserDept(projectInfoPlanQry));
}
@ApiOperation("Q9.鍙戣澶勫鎵� 鑾峰彇椤圭洰缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�")
- @Override
+ @PostMapping(path = "/queryRegulatoryProjectInfoPlanPage")
public Result<ProjectPlanBookOut> queryRegulatoryProjectInfoPlanPage(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryRegulatoryProjectInfoPlanPage(projectInfoPlanQry));
}
@ApiOperation("Q9.璐㈠姟澶勫鎵� 鑾峰彇椤圭洰缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�")
- @Override
+ @PostMapping(path = "/queryProjectInfoPlanPage")
public Result<ProjectPlanBookOut> queryProjectInfoPlanPage(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanPage(projectInfoPlanQry));
}
@ApiOperation("Q10.鑾峰彇鏃ュ父缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�")
- @Override
+ @PostMapping(path = "/queryProjectDailyPlan")
public Result<ProjectPlanBookOut> queryProjectDailyPlan(@RequestBody ProjectDailyPlanQry projectDailyPlanQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectDailyPlan(projectDailyPlanQry));
}
@ApiOperation("Q11.鏍规嵁浼犲叆閮ㄩ棬鑾峰彇鏌ヨ瀹氶鍩虹淇℃伅")
- @Override
+ @PostMapping(path = "/queryBasicInformation")
public Result<PlanBookBasicInformationOut> queryBasicInformation(@RequestBody PlanBookBasicInformationQry planBookBasicInformationQry) {
return ok(ResponseCode.SUCCESS, queryService.queryBasicInformation(planBookBasicInformationQry));
}
- /**
- * 瀵煎嚭鏃ュ父鐢虫姤涔�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
@ApiOperation("Q13.鎵归噺瀵煎嚭鏃ュ父缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/exportProjectPlan")
public void exportProjectPlan(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectDailyPlanQry projectDailyPlanQry) {
queryService.exportProjectPlan(request, response, projectDailyPlanQry);
}
- /**
- * 瀵煎嚭椤圭洰鐢虫姤涔�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectInfoPlanQry 椤圭洰鏃ュ父璁″垝qry
- */
@ApiOperation("Q12.鎵归噺瀵煎嚭椤圭洰缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/exportInfoProjectPlan")
public void exportInfoProjectPlan(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
queryService.exportInfoProjectPlan(request, response, projectInfoPlanQry);
}
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堝鍑洪」鐩敵鎶ヤ功
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectInfoPlanQry 椤圭洰淇℃伅璁″垝qry
- */
@ApiOperation("Q14.鎵归噺瀵煎嚭椤圭洰缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/exportInfoProjectPlanByCurrentUserDept")
public void exportInfoProjectPlanByCurrentUserDept(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
queryService.exportInfoProjectPlanByCurrentUserDept(request, response, projectInfoPlanQry);
}
- /**
- * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堝鍑洪」鐩敵鎶ヤ功
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param projectPersonPlanQry 椤圭洰淇℃伅璁″垝qry
- */
@ApiOperation("Q15.鎵归噺瀵煎嚭浜哄憳缁忚垂鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/exportPersonProjectPlanByCurrentUserDept")
public void exportPersonProjectPlanByCurrentUserDept(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectPersonPlanQry projectPersonPlanQry) {
queryService.exportPersonProjectPlanByCurrentUserDept(request, response, projectPersonPlanQry);
}
- /**
- * 涓嬭浇椤圭洰鐢虫姤涔﹀鍏ユā鏉�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- */
@ApiOperation("Q16.涓嬭浇椤圭洰鐢虫姤涔﹀鍏ユā鏉�")
- @Override
+ @PostMapping(path = "/downLoadInfoTemplate")
public void downLoadInfoTemplate(HttpServletRequest request, HttpServletResponse response) {
queryService.downLoadInfoTemplate(request, response);
}
- /**
- * 瀵煎叆椤圭洰鐢虫姤涔�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result<Object>}
- */
@ApiOperation("C12.瀵煎叆椤圭洰鐢虫姤涔�")
- @Override
+ @PostMapping(path = "/importInfoPlan")
public Result<Object> importInfoPlan(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file") MultipartFile file) {
commandSvr.importInfoPlan(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 澶嶅埗鍘嗗彶鍏叡椤圭洰
- *
- * @param id id
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping(path = "/copyHistoryPublicProject")
@ApiOperation("C13.鎷疯礉鍘嗗彶鍏敤缁忚垂浣滀负鏈勾鍏敤缁忚垂")
public Result<Object> copyHistoryPublicProject(Long id) {
commandSvr.copyHistoryPublicProject(id);
@@ -300,100 +254,67 @@ public class ProjectPlanController extends BaseController implements IProjectPla
}
@ApiOperation("10.鑾峰彇鐧诲綍浜烘墍鍦ㄩ儴闂ㄧ殑鍘嗗彶骞村害鐨勯」鐩簱淇℃伅(鍒嗛〉鏄剧ず)")
- @Override
+ @PostMapping(path = "/queryHistoryPublicPageByCurrentUserDept")
public Result<PublicProjectHisOut> queryHistoryPublicPageByCurrentUserDept(@RequestBody PublicHisQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryHistoryPublicPageByCurrentUserDept(qry));
}
@ApiOperation("10.寮哄埗娴佺▼閲嶅惎锛堜笉閬楃暀鍘嗗彶瀹℃壒璁板綍锛�")
- @Override
+ @PostMapping(path = "/initProjectPlanFlow")
public Result<Integer> initProjectPlanFlow(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, commandSvr.initProjectPlanFlow(ids));
}
- /**
- * 鍏宠仈缁忚垂鍗″彿鏌ヨ
- * @param projectPlanBooksCmd id
- * @return {@link Result}<{@link Integer}>
- */
- @Override
+ @PostMapping(path = "/queryProjectPlanBook")
@ApiOperation("鍏宠仈缁忚垂鍗″彿鏌ヨ")
public Result<ProjectPlanBooksOut> queryProjectPlanBook(@RequestBody ProjectPlanBooksCmd projectPlanBooksCmd) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectPlanBook(projectPlanBooksCmd));
}
- /**
- * 淇濆瓨缁忚垂鍗″彿
- *
- * @param expenseCard expenseCard
- * @return {@link Result}<{@link Integer}>
- */
- @Override
+ @PostMapping(path = "/saveExpenseCardNumber")
@ApiOperation("淇濆瓨ExpenseCard")
+ @Validated({ExpenseCardCmd.SaveExpenseCardCmdInterface.class})
public Result<Object> saveExpenseCardNumber(@RequestBody ExpenseCardCmd expenseCard) {
commandSvr.saveExpenseCardNumber(expenseCard);
return ok(ResponseCode.SUCCESS);
}
- /**
- * init閰嶉淇℃伅
- *
- * @return {@link Result<Integer>}
- */
- @Override
+ @PostMapping(path = "/initQuotaInfo")
@ApiOperation("鍚屾鏁版嵁鑷虫寚鏍�")
public Result<Integer> initQuotaInfo() {
return ok(ResponseCode.SUCCESS, commandSvr.initQuotaInfo());
}
- /**
- * 瀵煎嚭
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/export")
@ApiOperation("瀵煎嚭鍏宠仈缁忚垂鍗″彿")
public Result<Object> export(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectPlanBooksCmd projectPlanBooksCmd) {
queryService.export(request, response, projectPlanBooksCmd);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping(path = "/queryPayNameAndMoneyByProjectCode")
@ApiOperation("鑾峰彇鏀嚭淇℃伅")
public Result<SubjectOut> queryPayNameAndMoneyByProjectCode(@RequestBody List<SubjectCmd> subjectCmdList) {
return ok(ResponseCode.SUCCESS, queryService.queryPayNameAndMoneyByProjectCode(subjectCmdList));
}
@ApiOperation("鍚屾涓€涓婄淮鎸佹€х粡璐瑰埌浜屼笂")
- @Override
+ @PostMapping(path = "/syncOneUpPerson")
public Result<Object> syncOneUpPersonnelExpenditureToTwoUp(@RequestParam Integer year) {
commandSvr.syncOneUpPersonnelExpenditureToTwoUp(year);
return ok(ResponseCode.SUCCESS);
}
@ApiOperation("瀵煎嚭浜哄憳缁忚垂")
- @Override
+ @PostMapping(path = "/exportPersonFund")
public Result<Object> exportPersonFund(HttpServletRequest request, HttpServletResponse response, @RequestBody ProjectPersonPlanQry projectPersonPlanQry) {
queryService.exportPersonFund(request,response,projectPersonPlanQry);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鏌ヨ鐢虫姤涔︽墍鏈夌姸鎬�
- *
- * @return {@link Result}<{@link ProjectPlanStateOut}>
- */
- @Override
+ @PostMapping(path = "/queryProjectPlanStateOut")
@ApiOperation("鏌ヨ鐢虫姤涔︽墍鏈夌姸鎬�")
public Result<ProjectPlanStateOut> queryProjectPlanStateOut() {
return ok(ResponseCode.SUCCESS, queryService.queryProjectPlanStateOut());
}
-
- @Override
- @ApiOperation("鑾峰彇鎵€鏈夌粡璐瑰崱鍙�")
- public Result<FundCodeOut> getFundCodeList() {
- return ok(ResponseCode.SUCCESS,queryService.getFundCodeList());
- }
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectTargetController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectTargetController.java
index b10708be07a5f78f690064cdd8954528b947e801..41a7db6b0086fd9fb1557db3cbf0931cec509475 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectTargetController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectTargetController.java
@@ -11,6 +11,7 @@ import com.seasky.projectplan.dto.projecttarget.ProjectTargetQry;
import com.seasky.projectplan.dto.projecttarget.ProjectTargetTreeOut;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -46,7 +47,7 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<Integer>}
*/
@ApiOperation("1.淇濆瓨缁╂晥鎸囨爣")
- @Override
+ @PostMapping(path = "/saveProjectTarget")
public Result<Long> saveProjectTarget(@RequestBody ProjectTargetCmd projectTargetCmd) {
return ok(ResponseCode.SUCCESS, commandService.saveProjectTarget(projectTargetCmd));
}
@@ -57,13 +58,13 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<Integer>}
*/
@ApiOperation("2.鍒犻櫎椤圭洰缁╂晥鎸囨爣")
- @Override
+ @PostMapping(path = "/removeProjectTarget")
public Result<Integer> removeProjectTarget(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, commandService.removeProjectTarget(ids));
}
@ApiOperation("鍒犻櫎鎸囨爣缁╂晥搴�")
- @Override
+ @PostMapping(path = "/removeProjectTargetStore")
public Result<Integer> removeProjectTargetStore(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, commandService.removeProjectTargetStore(id));
}
@@ -75,7 +76,7 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<Integer>}
*/
@ApiOperation("3.鍚屾涓婂勾鐨勭哗鏁堝簱")
- @Override
+ @PostMapping(path = "/initProjectTargetList")
public Result<Integer> initProjectTargetList(@RequestBody ProjectTargetCmd projectTargetCmd) {
return ok(ResponseCode.SUCCESS, commandService.initProjectTargetList(projectTargetCmd));
}
@@ -90,7 +91,7 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<ProjectTargetOut>}
*/
@ApiOperation("Q1.鏌ヨ缁╂晥鎸囨爣鏄庣粏")
- @Override
+ @PostMapping(path = "/queryProjectTarget")
public Result<ProjectTargetOut> queryProjectTargetById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectTargetById(id));
}
@@ -101,18 +102,18 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<ProjectTargetTreeOut>}
*/
@ApiOperation("Q2.鏌ヨ缁╂晥鎸囨爣鏍�")
- @Override
+ @PostMapping("queryProjectTargetTree")
public Result<ProjectTargetTreeOut> queryProjectTargetListTree(@RequestBody ProjectTargetQry projectTargetQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectTargetListTree(projectTargetQry));
}
- @Override
+ @PostMapping("queryProjectTargetOneList")
@ApiOperation("鏌ヨ缁╂晥搴撲笅鎷夋")
public Result<ProjectTargetOut> queryProjectTargetOneList(@RequestBody ProjectTargetQry projectTargetQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectTargetOneList(projectTargetQry));
}
- @Override
+ @PostMapping("queryLeafNodeById")
@ApiOperation("鏍规嵁鎸囨爣缁╂晥搴搃d鑾峰彇鎸囨爣缁╂晥搴撳彾瀛愯妭鐐筰d闆嗗悎")
public Result<Long> queryLeafNodeById(@RequestBody ProjectTargetQry projectTargetQry) {
return ok(ResponseCode.SUCCESS, queryService.queryLeafNodeById(projectTargetQry));
@@ -125,7 +126,7 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<ProjectTargetOut>}
*/
@ApiOperation("Q3.閫氳繃鐖惰妭鐐筰d鍒嗛〉鏌ヨ缁╂晥鎸囨爣")
- @Override
+ @PostMapping(path = "/queryProjectTargetPageByPId")
public Result<ProjectTargetOut> queryProjectTargetPageByParentNodeId(@RequestBody ProjectTargetQry projectTargetQry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectTargetPageByParentNodeId(projectTargetQry));
}
@@ -139,13 +140,13 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<Object>}
*/
@ApiOperation("4.瀵煎叆缁╂晥绠＄悊")
- @Override
+ @PostMapping(path = "/importProjectTarget")
public Result<Object> importProjectTarget(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "file")MultipartFile file) {
commandService.importProjectTarget(request,response,file);
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping(path = "/importProjectTargetTemplate")
@ApiOperation("4.瀵煎叆缁╂晥绠＄悊妯℃澘")
public Result<Object> importProjectTargetTemplate(HttpServletRequest request, HttpServletResponse response) {
queryService.importProjectTargetTemplate(request,response);
@@ -161,7 +162,7 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result}<{@link Object}>
*/
@ApiOperation("Q4.瀵煎嚭缁╂晥绠＄悊")
- @Override
+ @PostMapping(path = "/exportProjectTarget")
public Result<Object> exportProjectTarget(HttpServletRequest request, HttpServletResponse response, @RequestParam("parent") Long parent) {
queryService.exportProjectTarget(request,response,parent);
return ok(ResponseCode.SUCCESS);
@@ -174,7 +175,7 @@ public class ProjectTargetController extends BaseController implements IProjectT
* @return {@link Result<ProjectTargetTreeOut>}
*/
@ApiOperation("Q5.浠庝簩绾у紑濮嬫煡璇㈢哗鏁堟寚鏍囨爲")
- @Override
+ @PostMapping(path = "/querySecondProjectTargetListTree")
public Result<ProjectTargetTreeOut> querySecondProjectTargetListTree(@RequestBody ProjectTargetQry projectTargetQry) {
return ok(ResponseCode.SUCCESS, queryService.querySecondProjectTargetListTree(projectTargetQry));
}
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PublicInfoController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PublicInfoController.java
index e06039e0776472903645d5cf9f898f1670cb9e8c..81734ae024e5c6fbf924bbadb894da00c528c913 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PublicInfoController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/PublicInfoController.java
@@ -40,6 +40,7 @@ import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentInformat
import com.seasky.projectplan.dto.schoolStudentInformation.SchoolStudentOut;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@@ -68,496 +69,259 @@ public class PublicInfoController extends BaseController implements IPublicInfoC
@Resource
private PublicInfoQueryService publicInfoQueryService;
- /**
- * 淇濆瓨鐢熷潎瀹氶
- * @param cmd 鐢熷潎瀹氶cmd
- * @return {@link Long}
- */
@ApiOperation("1-1.淇濆瓨鐢熷潎瀹氶")
- @Override
+ @PostMapping(path = "/saveCollegeClasses")
public Result<Long> saveCollegeClasses(@RequestBody CollegeClassesCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveCollegeClasses(cmd));
}
- /**
- * 鍒犻櫎鐢熷潎瀹氶
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("1-2.鍒犻櫎鐢熷潎瀹氶")
- @Override
+ @PostMapping(path = "/removeCollegeClasses")
public Result<Long> removeCollegeClasses(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removeCollegeClasses(ids));
}
- /**
- * 鑾峰彇鐢熷潎瀹氶甯﹀垎椤�
- * @param qry qry
- * @return {@link Pagination < CollegeClassesOut >}
- */
@ApiOperation("1-3.鑾峰彇鐢熷潎瀹氶甯﹀垎椤�")
- @Override
+ @PostMapping(path = "/queryCollegeClasses")
public Result<CollegeClassesOut> queryCollegeClasses(@RequestBody CollegeClassesQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryCollegeClasses(qry));
}
- /**
- * 淇濆瓨浜哄憳淇℃伅(淇濆瓨鏁欒亴宸ヤ汉淇℃伅)
- * @param cmd 浜哄憳淇℃伅cmd
- * @return {@link Long}
- */
@ApiOperation("2-1.淇濆瓨浜哄憳淇℃伅")
- @Override
+ @PostMapping(path = "/savePeopleInformation")
public Result<Long> savePeopleInformation(@RequestBody PeopleInformationCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.savePeopleInformation(cmd));
}
- /**
- * 鍒犻櫎浜哄憳淇℃伅(鍒犻櫎鏁欒亴宸ヤ汉淇℃伅)
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("2-2.鍒犻櫎浜哄憳淇℃伅")
- @Override
+ @PostMapping(path = "/removePeopleInformation")
public Result<Long> removePeopleInformation(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removePeopleInformation(ids));
}
- /**
- * 浜哄憳淇℃伅甯﹀垎椤�(鏄剧ず鎵€鏈変汉鏁欒亴宸ヤ汉淇℃伅甯﹀垎椤�)
- * @param qry qry
- * @return {@link Pagination < PeopleInformationOut >}
- */
@ApiOperation("2-3.浜哄憳淇℃伅甯﹀垎椤�")
- @Override
+ @PostMapping(path = "/queryPeopleInformation")
public Result<PeopleInformationOut> queryPeopleInformation(@RequestBody PeopleInformationQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryPeopleInformation(qry));
}
- /**
- * 瀵煎叆-鏁欒亴宸ヤ汉淇℃伅-妯℃澘涓嬭浇
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importPeopleInformationTemplate")
@ApiOperation("瀵煎叆-鏁欒亴宸ヤ汉淇℃伅-妯℃澘涓嬭浇")
public Result<Object> importPeopleInformationTemplate(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.importPeopleInformationTemplate(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎叆-鏁欒亴宸ヤ汉淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importPeopleInformation")
@ApiOperation("瀵煎叆-鏁欒亴宸ヤ汉淇℃伅")
public Result<Object> importPeopleInformation(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
publicInfoSvr.importPeopleInformation(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎嚭-鏁欒亴宸ヤ汉淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/exportPeopleInformation")
@ApiOperation("瀵煎嚭-鏁欒亴宸ヤ汉淇℃伅")
public Result<Object> exportPeopleInformation(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.exportPeopleInformation(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 淇濆瓨鍦ㄦ牎瀛︾敓淇℃伅
- * @param cmd 鍦ㄦ牎瀛︾敓淇℃伅cmd
- * @return {@link Long}
- */
@ApiOperation("3-1.淇濆瓨鍦ㄦ牎瀛︾敓淇℃伅")
- @Override
+ @PostMapping(path = "/saveSchoolStudentInformation")
public Result<Long> saveSchoolStudentInformation(@RequestBody SchoolStudentInformationCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveSchoolStudentInformation(cmd));
}
- /**
- * 鍒犻櫎鍦ㄦ牎瀛︾敓淇℃伅
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("3-2.鍒犻櫎鍦ㄦ牎瀛︾敓淇℃伅")
- @Override
+ @PostMapping(path = "/removeSchoolStudentInformation")
public Result<Long> removeSchoolStudentInformation(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removeSchoolStudentInformation(ids));
}
- /**
- * 鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤�(鏄剧ず鍦ㄦ牎瀛︾敓淇℃伅)
- * @param qry qry
- * @return {@link Pagination < SchoolStudentInformationOut >}
- */
@ApiOperation("3-3.鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤�")
- @Override
+ @PostMapping(path = "/querySchoolStudentInformation")
public Result<SchoolStudentOut> querySchoolStudentInformation(@RequestBody SchoolStudentInformationQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.querySchoolStudentInformation(qry));
}
- /**
- * 瀵煎叆-鍦ㄦ牎瀛︾敓淇℃伅-妯℃澘涓嬭浇
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importSchoolStudentTemplate")
@ApiOperation("瀵煎叆-鍦ㄦ牎瀛︾敓淇℃伅-妯℃澘涓嬭浇")
public Result<Object> importSchoolStudentTemplate(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.importSchoolStudentTemplate(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎叆-鍦ㄦ牎瀛︾敓淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importSchoolStudent")
@ApiOperation("瀵煎叆-鍦ㄦ牎瀛︾敓淇℃伅")
public Result<Object> importSchoolStudent(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
publicInfoSvr.importSchoolStudent(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎嚭-鍦ㄦ牎瀛︾敓淇℃伅
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/exportSchoolStudent")
@ApiOperation("瀵煎嚭-鍦ㄦ牎瀛︾敓淇℃伅")
public Result<Object> exportSchoolStudent(HttpServletRequest request, HttpServletResponse response, @RequestBody SchoolStudentInformationQry qry) {
publicInfoQueryService.exportSchoolStudent(request, response, qry);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 淇濆瓨鍏叡璇句俊鎭紙寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛夛級
- * @param cmd 鍏叡璇句俊鎭痗md
- * @return {@link Long}
- */
@ApiOperation("4-1.淇濆瓨鍏叡璇句俊鎭�")
- @Override
+ @PostMapping(path = "/savePublicCourseInformation")
public Result<Long> savePublicCourseInformation(@RequestBody PublicCourseInformationCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.savePublicCourseInformation(cmd));
}
- /**
- * 鍒犻櫎鍏叡璇句俊鎭紙寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛夛級
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("4-2.鍒犻櫎鍏叡璇句俊鎭�")
- @Override
+ @PostMapping(path = "/removePublicCourseInformation")
public Result<Long> removePublicCourseInformation(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removePublicCourseInformation(ids));
}
- /**
- * 鍏叡璇句俊鎭甫鍒嗛〉锛堝紑璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛夛級
- * @param qry qry
- * @return {@link Pagination < PeopleInformationOut >}
- */
@ApiOperation("4-3.鍏叡璇句俊鎭甫鍒嗛〉")
- @Override
+ @PostMapping(path = "/queryPublicCourseInformation")
public Result<PublicCourseInformationOut> queryPublicCourseInformation(@RequestBody PublicCourseInformationQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryPublicCourseInformation(qry));
}
- /**
- * 瀵煎叆-寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛�-妯℃澘涓嬭浇
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importEducationalTemplate")
@ApiOperation("瀵煎叆-寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛�-妯℃澘涓嬭浇")
public Result<Object> importEducationalTemplate(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.importEducationalTemplate(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎叆-寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importEducational")
@ApiOperation("瀵煎叆-寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛�")
public Result<Object> importEducational(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
publicInfoSvr.importEducational(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎嚭-寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛�
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/exportEducational")
@ApiOperation("瀵煎嚭-寮€璇惧鏃舵暟銆佸疄楠屼汉鏃舵暟銆佹暀鐮斿寤鸿缁忚垂锛堟暀鍔″锛�")
public Result<Object> exportEducational(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.exportEducational(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 淇濆瓨闃垮疂绯绘暟
- * @param cmd 闃垮疂绯绘暟cmd
- * @return {@link Long}
- */
@ApiOperation("5-1.淇濆瓨闃垮疂绯绘暟")
- @Override
+ @PostMapping(path = "/saveCoefficient")
public Result<Long> saveCoefficient(@RequestBody CoefficientCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveCoefficient(cmd));
}
- /**
- * 鍒犻櫎闃垮疂绯绘暟
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("5-2.鍒犻櫎闃垮疂绯绘暟")
- @Override
+ @PostMapping(path = "/removeCoefficient")
public Result<Long> removeCoefficient(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removeCoefficient(ids));
}
- /**
- * 闃垮疂绯绘暟甯﹀垎椤�
- * @param qry qry
- * @return {@link Pagination < CoefficientOut >}
- */
@ApiOperation("5-3.闃垮疂绯绘暟甯﹀垎椤�")
- @Override
+ @PostMapping(path = "/queryCoefficient")
public Result<CoefficientOut> queryCoefficient(@RequestBody CoefficientQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryCoefficient(qry));
}
- /**
- * 淇濆瓨鏁欒亴宸ヤ汉鍧�
- * @param cmd 鏁欒亴宸ヤ汉鍧嘽md
- * @return {@link Long}
- */
@ApiOperation("6-1.淇濆瓨鏁欒亴宸ヤ汉鍧�")
- @Override
+ @PostMapping(path = "/saveFacultyStaff")
public Result<Long> saveFacultyStaff(@RequestBody FacultyStaffCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveFacultyStaff(cmd));
}
- /**
- * 鍒犻櫎鏁欒亴宸ヤ汉鍧�
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("6-2.鍒犻櫎鏁欒亴宸ヤ汉鍧�")
- @Override
+ @PostMapping(path = "/removeFacultyStaff")
public Result<Long> removeFacultyStaff(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removeFacultyStaff(ids));
}
- /**
- * 鏁欒亴宸ヤ汉鍧囧甫鍒嗛〉
- * @param qry qry
- * @return {@link Pagination < FacultyStaffOut >}
- */
@ApiOperation("6-3.鏁欒亴宸ヤ汉鍧囧甫鍒嗛〉")
- @Override
+ @PostMapping(path = "/queryFacultyStaff")
public Result<FacultyStaffOut> queryFacultyStaff(@RequestBody FacultyStaffQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryFacultyStaff(qry));
}
- /**
- * 淇濆瓨閮ㄩ棬鐗规畩缁忚垂
- * @param cmd 閮ㄩ棬鐗规畩缁忚垂cmd
- * @return {@link Long}
- */
@ApiOperation("7-1.淇濆瓨閮ㄩ棬鐗规畩缁忚垂")
- @Override
+ @PostMapping(path = "/saveSpecialFunds")
public Result<Long> saveSpecialFunds(@RequestBody SpecialFundsCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveSpecialFunds(cmd));
}
- /**
- * 鍒犻櫎閮ㄩ棬鐗规畩缁忚垂
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("7-2.鍒犻櫎閮ㄩ棬鐗规畩缁忚垂")
- @Override
+ @PostMapping(path = "/removeSpecialFunds")
public Result<Long> removeSpecialFunds(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removeSpecialFunds(ids));
}
- /**
- * 閮ㄩ棬鐗规畩缁忚垂甯﹀垎椤�
- * @param qry qry
- * @return {@link Pagination < SpecialFundsOut >}
- */
@ApiOperation("7-3.閮ㄩ棬鐗规畩缁忚垂甯﹀垎椤�")
- @Override
+ @PostMapping(path = "/querySpecialFunds")
public Result<SpecialFundsOut> querySpecialFunds(@RequestBody SpecialFundsQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.querySpecialFunds(qry));
}
- /**
- * 淇濆瓨绛旇京璐�
- * @param cmd 绛旇京璐筩md
- * @return {@link Long}
- */
@ApiOperation("8-1.淇濆瓨绛旇京璐�")
- @Override
+ @PostMapping(path = "/savePlea")
public Result<Long> savePlea(@RequestBody PleaCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.savePlea(cmd));
}
- /**
- * 鍒犻櫎绛旇京璐�
- * @param ids 鍒犻櫎涓婚敭
- * @return {@link Long}
- */
@ApiOperation("8-2.鍒犻櫎绛旇京璐�")
- @Override
+ @PostMapping(path = "/removePlea")
public Result<Long> removePlea(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removePlea(ids));
}
- /**
- * 绛旇京璐瑰甫鍒嗛〉
- * @param qry qry
- * @return {@link Pagination < PleaOut >}
- */
@ApiOperation("8-3.绛旇京璐瑰甫鍒嗛〉")
- @Override
+ @PostMapping(path = "/queryPlea")
public Result<PleaOut> queryPlea(@RequestBody PleaQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryPlea(qry));
}
- /**
- * 淇濆瓨缁忚垂鏍囧噯
- *
- * @param cmd cmd
- * @return {@link Result}<{@link Long}>
- */
- @Override
+ @PostMapping(path = "/saveFundingStandard")
@ApiOperation("淇濆瓨缁忚垂鏍囧噯")
public Result<Long> saveFundingStandard(@RequestBody FundingStandardCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveFundingStandard(cmd));
}
- /**
- * 鍒犻櫎缁忚垂鏍囧噯
- *
- * @param ids id
- * @return {@link Result}<{@link Long}>
- */
- @Override
+ @PostMapping(path = "/removeFundingStandard")
@ApiOperation("鍒犻櫎缁忚垂鏍囧噯")
public Result<Long> removeFundingStandard(@RequestBody List<Long> ids) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.removeFundingStandard(ids));
}
- /**
- * 鏌ヨ缁忚垂鏍囧噯
- *
- * @param qry qry
- * @return {@link Result}<{@link FundingStandardOut}>
- */
- @Override
+ @PostMapping(path = "/queryFundingStandard")
@ApiOperation("鏌ヨ缁忚垂鏍囧噯")
public Result<FundingStandardOut> queryFundingStandard(@RequestBody FundingStandardQry qry) {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryFundingStandard(qry));
}
- /**
- * 淇濆瓨璇存槑
- *
- * @param cmd cmd
- * @return {@link Result}<{@link Long}>
- */
- @Override
+ @PostMapping(path = "/saveExplain")
@ApiOperation("淇濆瓨璇存槑")
public Result<Long> saveExplain(@RequestBody ExplainCmd cmd) {
return ok(ResponseCode.SUCCESS, publicInfoSvr.saveExplain(cmd));
}
- /**
- * 瀵煎叆-缁忚垂鏍囧噯-妯℃澘
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importFundingStandardTemplate")
@ApiOperation("瀵煎叆-缁忚垂鏍囧噯-妯℃澘")
public Result<Object> importFundingStandardTemplate(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.importFundingStandardTemplate(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎叆-缁忚垂鏍囧噯
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @param file 鏂囦欢
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/importFundingStandard")
@ApiOperation("瀵煎叆-缁忚垂鏍囧噯")
public Result<Object> importFundingStandard(HttpServletRequest request, HttpServletResponse response, MultipartFile file) {
publicInfoSvr.importFundingStandard(request, response, file);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 瀵煎嚭-缁忚垂鏍囧噯
- *
- * @param request 璇锋眰
- * @param response 鍝嶅簲
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/exportFundingStandard")
@ApiOperation("瀵煎嚭-缁忚垂鏍囧噯")
public Result<Object> exportFundingStandard(HttpServletRequest request, HttpServletResponse response) {
publicInfoQueryService.exportFundingStandard(request, response);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 璐㈠姟纭
- *
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping(path = "/financeConfirm")
@ApiOperation("璐㈠姟纭")
public Result<Object> financeConfirm() {
return ok(ResponseCode.SUCCESS, publicInfoQueryService.financeConfirm());
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/QuotaManageController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/QuotaManageController.java
index 65dad4aa4d31c968d4112165564c75e4bd31d676..7f2636e9f3835149e94e12fe90fbdc0fd8ac57c4 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/QuotaManageController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/QuotaManageController.java
@@ -8,6 +8,8 @@ import com.seasky.projectplan.application.query.quotamanage.QuotaManageQueryServ
import com.seasky.projectplan.dto.quotamanage.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -35,171 +37,147 @@ public class QuotaManageController extends BaseController implements IQuotaManag
@Resource
private QuotaManageQueryService queryService;
- @Override
+ @PostMapping(path = "/initProjectType")
@ApiOperation("1.鍒濆鍖栭」鐩被鍨嬪畾棰�")
public Result<Integer> initProjectType(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.initProjectType(cmd));
}
- @Override
+ @PostMapping(path = "/initProjectDeptDaily")
@ApiOperation("2.鍒濆鍖栭儴闂ㄦ棩甯哥粡璐瑰畾棰�")
public Result<Integer> initProjectDeptDaily(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.initProjectDeptDaily(cmd));
}
- @Override
+ @PostMapping(path = "/initProjectDeptProject")
@ApiOperation("3.鍒濆鍖栭儴闂ㄩ」鐩粡璐瑰畾棰�")
public Result<Integer> initProjectDeptProject(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.initProjectDeptProject(cmd));
}
- @Override
+ @PostMapping(path = "/initProject")
@ApiOperation("4.鍒濆鍖栭」鐩畾棰�")
public Result<Integer> initProject(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.initProject(cmd));
}
- @Override
+ @PostMapping(path = "/initErXiaProject")
@ApiOperation("4.鍒濆鍖栦簩涓嬮」鐩畾棰�")
public Result<Integer> initErXiaProject(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.initErXiaProject(cmd));
}
- @Override
+ @PostMapping(path = "/saveProjectTypeMoney")
@ApiOperation("5.淇敼椤圭洰绫诲瀷瀹氶鐨勯噾棰�")
public Result<Integer> saveProjectTypeMoney(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.saveProjectTypeMoney(cmd));
}
- @Override
+ @PostMapping(path = "/saveProjectDeptMoney")
@ApiOperation("6.淇敼閮ㄩ棬瀹氶鐨勯噾棰�")
public Result<Integer> saveProjectDeptMoney(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.saveProjectDeptMoney(cmd));
}
- @Override
+ @PostMapping(path = "/saveErXiaProjectMoney")
@ApiOperation("淇敼浜屼笅椤圭洰瀹氶鐨勯噾棰�")
public Result<Integer> saveErXiaProjectMoney(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.saveErXiaProjectMoney(cmd));
}
- @Override
+ @PostMapping(path = "/saveProjectMoney")
@ApiOperation("7.淇敼鍏蜂綋椤圭洰瀹氶鐨勯噾棰�")
+ @Validated({QuotaManageCmd.SaveQuotaManageCmdInterface.class})
public Result<Integer> saveProjectMoney(@RequestBody QuotaManageCmd cmd) {
return ok(ResponseCode.SUCCESS, domainSvr.saveProjectMoney(cmd));
}
//浠ヤ笅 Q绾�
- @Override
+ @PostMapping(path = "/queryProjectTypeQuotaPage")
@ApiOperation("Q1.鏌ヨ椤圭洰绫诲瀷瀹氶淇℃伅甯﹀垎椤�")
public Result<QuotaManageOut> queryProjectTypeQuotaPage(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectTypeQuotaPage(qry));
}
- @Override
+ @PostMapping(path = "/queryDeptQuotaDailyPage")
@ApiOperation("Q2.鏌ヨ閮ㄩ棬鏃ュ父缁忚垂瀹氶甯﹀垎椤�")
public Result<QuotaManageOut> queryDeptQuotaDailyPage(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryDeptQuotaDailyPage(qry));
}
- @Override
+ @PostMapping(path = "/queryDeptQuotaProjectPage")
@ApiOperation("Q3.鏌ヨ閮ㄩ棬椤圭洰缁忚垂瀹氶甯﹀垎椤�")
public Result<QuotaManageOut> queryDeptQuotaProjectPage(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryDeptQuotaProjectPage(qry));
}
- @Override
+ @PostMapping(path = "/queryProjectQuotaPage")
@ApiOperation("Q4.鏌ヨ鍏蜂綋椤圭洰瀹氶淇℃伅甯﹀垎椤�")
public Result<QuotaManageOut> queryProjectQuotaPage(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryProjectQuotaPage(qry));
}
- @Override
+ @PostMapping(path = "/queryErXiaProjectQuotaPage")
@ApiOperation("鏌ヨ浜屼笅椤圭洰瀹氶淇℃伅甯﹀垎椤�")
public Result<QuotaManageOut> queryErXiaProjectQuotaPage(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryErXiaProjectQuotaPage(qry));
}
- @Override
+ @PostMapping(path = "/queryDeptQuotaDailyByCurrentUserDept")
@ApiOperation("Q5.鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鎵€鍦ㄩ儴闂ㄦ樉绀烘棩甯哥粡璐瑰畾棰濅俊鎭�")
public Result<QuotaManageOut> queryDeptQuotaDailyByCurrentUserDept(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryDeptQuotaDailyByCurrentUserDept(qry));
}
- @Override
+ @PostMapping(path = "/queryDeptQuotaProjectByCurrentUserDept")
@ApiOperation("Q6.鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鎵€鍦ㄩ儴闂ㄦ樉绀洪」鐩粡璐瑰畾棰濅俊鎭�")
public Result<QuotaManageOut> queryDeptQuotaProjectByCurrentUserDept(@RequestBody QuotaManageQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryDeptQuotaProjectByCurrentUserDept(qry));
}
- /**
- * 鏌ヨ閰嶉绠＄悊鍒楄〃
- *
- * @param qry qry
- * @return {@link Result<ToQuotaListOut>}
- */
- @Override
+ @PostMapping(path = "/queryToQuotaManageList")
@ApiOperation("Q7.鏌ヨ閰嶉绠＄悊鍒楄〃")
public Result<ToQuotaListOut> queryToQuotaManageList(@RequestBody ToQuotaListQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryToQuotaManageList(qry));
}
- /**
- * 鏌ヨ鍗曚釜閰嶉绠＄悊
- *
- * @param id id
- * @return {@link Result<ToQuotaManageOut>}
- */
- @Override
+ @PostMapping(path = "/queryToQuotaManage")
@ApiOperation("Q8.鏌ヨ鍗曚釜閰嶉绠＄悊")
public Result<ToQuotaManageOut> queryToQuotaManage(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryToQuotaManage(id));
}
-
- /**
- * 鏌ヨ鈥濆彲浠ヤ娇鐢ㄩ」鐩�
- *
- * @param qry qry
- * @return {@link Result<ToQuotaMoneyManageCmd>}
- */
- @Override
+ @PostMapping(path = "/queryQuotCanUseProject")
@ApiOperation("Q9.鏌ヨ鍙互浣跨敤椤圭洰")
public Result<ToQuotaMoneyManageCmd> queryQuotCanUseProject(@RequestBody ToQuotaListQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryQuotCanUseProject(qry));
}
- @Override
+ @PostMapping(path = "/saveQuotaManage")
@ApiOperation("Q10.淇濆瓨浜屼笅鎷ㄦ棰濆害")
public Result<Integer> saveQuotaManage(@RequestBody ToQuotaManageCmd toQuotaManageCmd) {
return ok(ResponseCode.SUCCESS, domainSvr.saveQuotaManage(toQuotaManageCmd));
}
- @Override
+ @PostMapping(path = "/modifyQuotaMoney")
@ApiOperation("Q11.淇敼閲戦")
public Result<Integer> modifyQuotaMoney(@RequestParam Long id, @RequestParam BigDecimal money) {
return ok(ResponseCode.SUCCESS, domainSvr.modifyQuotaMoney(id, money));
}
- @Override
+ @PostMapping(path = "/queryToQuotaDeptByCurUserDept")
@ApiOperation("Q12.鏌ヨ褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄥ彲鍒嗛厤鐨勫唴瀹�")
public Result<ToQuotaDeptOut> queryToQuotaDeptByCurUserDept(@RequestBody ToQuotaListQry qry) {
return ok(ResponseCode.SUCCESS, queryService.queryToQuotaDeptByCurUserDept(qry));
}
- /**
- * 鏌ヨ閰嶉閫氳繃id
- *
- * @param id id
- * @return {@link Result<ToQuotaMoneyManageCmd>}
- */
- @Override
+ @PostMapping(path = "/queryToQuotaMoneyById")
@ApiOperation("Q13.鏌ヨ閰嶉閫氳繃id")
public Result<GetToQuotaMoneyOut> queryToQuotaMoneyById(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryToQuotaMoneyById(id));
}
- @Override
+ @PostMapping(path = "/remove")
@ApiOperation("Q14.鏍规嵁idlist鎵归噺鍒犻櫎")
public Result<Integer> remove(@RequestBody List<Long> idList) {
return ok(ResponseCode.SUCCESS, domainSvr.remove(idList));
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/TargetController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/TargetController.java
index 1da28ec24d04ae03efd81a2bba80b7c09d55ce42..e8f69ffebef2bbd1619e65348ee6341c2bbe5be7 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/TargetController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/TargetController.java
@@ -40,125 +40,71 @@ public class TargetController implements ITargetController {
@Resource
private TargetPlanSvr targetPlanSvr;
- /**
- * 鑷垜璇勪环瑙嗗浘甯﹀垎椤�
- *
- * @param targetQry 骞�
- * @return {@link Result < TargetListOut >}
- */
- @Override
+ @PostMapping(path = "/selfTargetPage")
@ApiOperation("1.鑷垜璇勪环瑙嗗浘甯﹀垎椤�")
public Result<TargetListOut> selfTargetPage(@RequestBody TargetQry targetQry) {
return ok(ResponseCode.SUCCESS, queryService.querySelfTargetPage(targetQry));
}
- /**
- * 璺熻釜璇勪环瑙嗗浘甯﹀垎椤�
- *
- * @param targetQry 涓€骞�
- * @return {@link Result<TargetListOut>}
- */
- @Override
+ @PostMapping(path = "/followTargetPage")
@ApiOperation("2.璺熻釜璇勪环瑙嗗浘甯﹀垎椤�")
public Result<TargetListOut> followTargetPage(@RequestBody TargetQry targetQry) {
return ok(ResponseCode.SUCCESS, queryService.queryOwnTargetPage(targetQry));
}
- /**
- * 缁╂晥鏁存敼瑙嗗浘甯﹀垎椤�
- *
- * @param targetQry 涓€骞�
- * @return {@link Result<TargetListOut>}
- */
- @Override
+ @PostMapping(path = "/reformTargetPage")
@ApiOperation("3.缁╂晥鏁存敼瑙嗗浘甯﹀垎椤�")
public Result<TargetListOut> reformTargetPage(@RequestBody TargetQry targetQry) {
return ok(ResponseCode.SUCCESS, queryService.querySelfTargetPage(targetQry));
}
- /**
- * 淇濆瓨鑷瘎缁╂晥琛�
- *
- * @param cmd cmd
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping("/saveTargetPlanSelf")
@ApiOperation("4.淇濆瓨鑷瘎缁╂晥琛�")
public Result<Object> saveTargetPlanSelf(@RequestBody TargetCmd cmd) {
targetPlanSvr.save(cmd, "鑷瘎");
return ok(ResponseCode.SUCCESS);
}
- /**
- * 淇濆瓨璺熻釜缁╂晥琛�
- *
- * @param cmd cmd
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping("/saveTargetPlanOwn")
@ApiOperation("5.淇濆瓨璺熻釜缁╂晥琛�")
public Result<Object> saveTargetPlanOwn(@RequestBody TargetCmd cmd) {
targetPlanSvr.save(cmd, "璺熻釜");
return ok(ResponseCode.SUCCESS);
}
- /**
- * 淇濆瓨缁╂晥鏁存敼琛�
- *
- * @param cmd cmd
- * @return {@link Result<Object>}
- */
- @Override
+ @PostMapping("/saveTargetPlanReform")
@ApiOperation("6.淇濆瓨缁╂晥鏁存敼琛�")
public Result<Object> saveTargetPlanReform(@RequestBody TargetCmd cmd) {
targetPlanSvr.save(cmd, "鏁存敼");
return ok(ResponseCode.SUCCESS);
}
- @Override
+ @PostMapping("/queryTargetPlan")
@ApiOperation("7.鏌ヨ")
public Result<QueryTargetPlan> queryTargetPlan(@RequestParam Long parentId, @RequestParam String type) {
return ok(ResponseCode.SUCCESS, queryService.queryTargetPlan(parentId, type));
}
- @Override
+ @PostMapping("/queryTargetByPlanId")
@ApiOperation("8.鏍规嵁id鑾峰彇鐢虫姤鏃剁殑缁╂晥鎸囨爣鍊�")
public Result<TargetValueContentOut> queryTargetByPlanId(@RequestParam Long id) {
return ok(ResponseCode.SUCCESS, queryService.queryTargetByPlanId(id));
}
- /**
- * 鎻愪氦鐨勭洰鏍�
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/submitTarget")
@ApiOperation("鎻愪氦")
public Result<Object> submitTarget(@RequestBody ActionFlowCmd actionFlowCmd) {
return ok(ResponseCode.SUCCESS, queryService.submitTarget(actionFlowCmd));
}
- /**
- * 鍥炴粴
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/rollBackTarget")
@ApiOperation("鍥炴粴")
public Result<Object> rollBackTarget(@RequestBody ActionFlowCmd actionFlowCmd) {
queryService.rollBackTarget(actionFlowCmd);
return ok(ResponseCode.SUCCESS);
}
- /**
- * 鍥炴挙
- *
- * @param actionFlowCmd 鍔ㄤ綔娴乧md
- * @return {@link Result}<{@link Object}>
- */
- @Override
+ @PostMapping("/recallTarget")
@ApiOperation("鍥炴挙")
public Result<Object> recallTarget(@RequestBody ActionFlowCmd actionFlowCmd) {
queryService.recallTarget(actionFlowCmd);