diff --git "a/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\345\271\277\345\267\236\344\270\255\345\214\273\350\215\257\346\224\271\351\200\240\351\234\200\346\261\202\346\216\245\345\217\243.md" "b/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\345\271\277\345\267\236\344\270\255\345\214\273\350\215\257\346\224\271\351\200\240\351\234\200\346\261\202\346\216\245\345\217\243.md" index f91d773ff16b3069c3dbfddfdcae418ab1d3c313..85f15f6cb2e3d9a5eb291f363ea526273f544f3e 100644 --- "a/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\345\271\277\345\267\236\344\270\255\345\214\273\350\215\257\346\224\271\351\200\240\351\234\200\346\261\202\346\216\245\345\217\243.md" +++ "b/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\345\271\277\345\267\236\344\270\255\345\214\273\350\215\257\346\224\271\351\200\240\351\234\200\346\261\202\346\216\245\345\217\243.md" @@ -231,3 +231,41 @@ } ``` +# 椤圭洰搴撴敼閫� + +## 鏍规嵁鐢虫姤鐘舵€佸睍绀洪」鐩簱鍩烘湰灞炴€�(榛樿鏌ユ墍鏈�,璧嬪€兼煡鐢虫姤搴撱€佸偍澶囧簱銆佸畬缁撳簱銆佸緟鍔�/宸插姙/宸插畬鎴�) + +| 绫� | 鍊� | +| ------ | ------------------------------------- | +| URL | /projectLibrary/listProjectLibraryGzy | +| Method | POST | + +### 璇锋眰鍙傛暟 + +| 鍙傛暟鍚� | 绫诲瀷 | 澶囨敞 | +| ------------------- | ------- | ------------------------------------------- | +| declarationStateGzy | int | 鐢虫姤鐘舵€侊紙0锛氱敵鎶ュ簱锛�1锛氬偍澶囧簱锛�2锛氬畬缁撳簱锛� | +| year | Integer | 骞翠唤 | +| projectName | String | 椤圭洰鍚嶇О | +| pageIndex | Integer | 椤电爜 | +| pageSize | Integer | 椤甸潰澶у皬 | + +### 璇锋眰浣� + +```json +{ + "pageIndex": 1, + "pageSize": 10, + "projectName": "", + "declarationStateGzy":0 + "year":2022 +} +``` + +### 杩斿洖 + +```json + +``` + +## diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/budgetinfo/BudgetInfoQueryService.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/budgetinfo/BudgetInfoQueryService.java index a0dcc39452fdbdbad793913f554b66cca478b99a..18599e91c208c014cc1035b52b0db4785a55a62a 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/application/query/budgetinfo/BudgetInfoQueryService.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/query/budgetinfo/BudgetInfoQueryService.java @@ -50,7 +50,6 @@ public interface BudgetInfoQueryService extends BaseService<BudgetInfoPo> { * @return List<BudgetInfoTreeOut> */ List<BudgetInfoTreeOut> queryBudgetInfoListTreeByUser(BudgetInfoQry budgetInfoQry); - /** * 閫氳繃鐖惰妭鐐筰d 鍒嗛〉 鏌ヨ棰勭畻淇℃伅椤甸潰 * 鏌ヨ璇d涓嬫墍鏈夊瓙绾ч」鐩被鍨嬩俊鎭� diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml index 657b26a571571e81ad8074ff85d2c24c587aab03..fcbc7137cb833c068ffe9c59b27b3a307e093aea 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectLibraryMapper.xml @@ -45,13 +45,13 @@ </select> <select id="listProjectLibraryPo" resultType="com.seasky.projectplan.infrastructure.dataobject.po.ProjectLibraryPo"> - select p1.year, p1.projectName,p1.planMoney,p1.departmentCode,p1.projectLeaderId + select p1.year, p1.project_name,p1.plan_money,p1.department_code,p1.project_leader_id,p1.id from project_library p1 inner join project_plan_book p2 on p1.id = p2.project_library_id where p1.available = 'YES' - <if test="pm.departmentCode != null and pm.departmentCode != ''"> - and p1.department_code = #{pm.departmentCode} + <if test="pm.declarationStateGzy != null"> + and p2.declaration_state_gzy = #{pm.declarationStateGzy} </if> - <if test="pm.year != null and pm.year != ''"> + <if test="pm.year != null"> and p1.year = #{pm.year} </if> <if test="pm.projectName != null and pm.projectName != ''"> diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java index 6e89d43bfaa37ef857dbb8a4b627bb0bb5734129..c7f20b9bd119a4149fc1a4aadd69d3df6bb0f0ac 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java @@ -3,9 +3,12 @@ package com.seasky.projectplan.infrastructure.reader.projectlibrary; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.injector.methods.SelectByMap; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.seasky.core.common.Error; import com.seasky.core.common.Pagination; +import com.seasky.core.common.ResponseCode; import com.seasky.core.common.Result; import com.seasky.core.ddd.utils.MapperUtils; +import com.seasky.core.exception.DataAccessException; import com.seasky.micro.basedata.api.IUser; import com.seasky.micro.basedata.dto.OrganizationDTO; import com.seasky.microflowapi.api.IFlow; @@ -58,10 +61,6 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { @Resource QuotaMapper quotaMapper; - private final static String STAY_FLOW = "寰呭姙"; - private final static String DONE_FLOW = "宸插姙"; - private final static String FINISH_FLOW = "宸插畬鎴�"; - @Override public Pagination<ProjectLibraryOut> queryProjectLibraryPage(ProjectLibraryQry qry) { @@ -232,8 +231,13 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { if (!(ObjectUtils.isEmpty(qry.getYear()))) { qry.setYear(qry.getYear()-1); + }else { + throw new DataAccessException(new Error(ResponseCode.DATA_VERIFY_EXCEPTION, null, "鏈幏鍙栧埌骞翠唤", "")); } + //鐢虫姤涔︾姸鎬佷负鍌ㄥ搴� + qry.setDeclarationStateGzy(1); + qry.setDeptCodeList(makeCurrentUserDeptCodeList()); List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.listProjectLibraryPo(page, qry).getRecords()); @@ -344,7 +348,7 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { qry.setDeptCodeList(makeCurrentUserDeptCodeList()); - List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.queryList(page, qry).getRecords()); + List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.listProjectLibraryPo(page, qry).getRecords()); ProjectPlanBookPo po; for (ProjectLibraryOut item : outList) { diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/publicinfo/PublicInfoRepositoryImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/publicinfo/PublicInfoRepositoryImpl.java index d8477c9d01516b54e76567693d8239875442fb10..bdf4eba9104a24cfc4fcc76070a3fa8e4988ffda 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/publicinfo/PublicInfoRepositoryImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/publicinfo/PublicInfoRepositoryImpl.java @@ -270,8 +270,6 @@ public class PublicInfoRepositoryImpl implements PublicInfoRepository { if (schoolStudentInformationMapper.updateById(po) != 1){ throw new DataAccessException(new Error(ResponseCode.SERVER_INTERNAL_EXCEPTION, null, "鍦ㄦ牎瀛︾敓淇℃伅淇敼澶辫触", "")); } - throw new DataAccessException(new Error(ResponseCode.SERVER_INTERNAL_EXCEPTION, null, "鍦ㄦ牎瀛︾敓淇℃伅閿欒娴嬭瘯", "")); - } return po.getId(); }