diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/CoefficientPo.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/CoefficientPo.java index acb64ffdcdaaec9dd6aa3bdd3c419487496791fa..d44ec59551a1a66fafc63980f8795de145f9d9dd 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/CoefficientPo.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/CoefficientPo.java @@ -29,10 +29,10 @@ public class CoefficientPo extends BaseDataObject { @ApiModelProperty("骞翠唤") private BigInteger year; - @TableField("begin") + @TableField("begins") @ApiModelProperty("浜烘暟寮€濮�") private BigInteger begin; - @TableField("end") + @TableField("ends") @ApiModelProperty("浜烘暟缁撴潫") private BigInteger end; @TableField("coefficient") diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/FacultyStaffPo.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/FacultyStaffPo.java index 26a249d5bc448f4685d98a5fa2e928519498c7bd..fd42175fc5a3a46cb0cb08c7eac675cfba774e8e 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/FacultyStaffPo.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/dataobject/po/FacultyStaffPo.java @@ -28,10 +28,10 @@ public class FacultyStaffPo extends BaseDataObject { @ApiModelProperty("骞翠唤") private BigInteger year; - @TableField("begin") + @TableField("begins") @ApiModelProperty("浜烘暟寮€濮�") private BigInteger begin; - @TableField("end") + @TableField("ends") @ApiModelProperty("浜烘暟缁撴潫") private BigInteger end; @TableField("Per_capita") diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/InComePlanMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/InComePlanMapper.xml index 7d538350890e3a734e08f961b0d3a88d245afc0f..94faccf128954da863cc6a475df7c0dd7c728283 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/InComePlanMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/InComePlanMapper.xml @@ -102,7 +102,7 @@ <if test="pm.inComePlanType != null and pm.inComePlanType != ''"> and inComePlanType = #{pm.inComePlanType} </if> - <if test="flow != null "> + <if test="flow != null and flow.size > 0 "> and processId in <foreach collection="flow" item="item" index="index" open="(" close=")" separator=","> ${item} diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java index 24c9f445d0183fb84b11f757f0051ce877ebfccc..030c5116cd965791a243e687ad6c972941726e84 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/InComePlan/InComePlanQueryServiceImpl.java @@ -3,7 +3,10 @@ package com.seasky.projectplan.infrastructure.reader.InComePlan; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.seasky.core.base.AbstractService; +import com.seasky.core.common.Error; import com.seasky.core.common.Pagination; +import com.seasky.core.common.ResponseCode; +import com.seasky.core.exception.DataAccessException; import com.seasky.micro.basedata.api.IUser; import com.seasky.micro.basedata.dto.OrganizationDTO; import com.seasky.microflowapi.dto.FlowCanShowOut; @@ -207,7 +210,9 @@ public class InComePlanQueryServiceImpl extends AbstractService<InComePlanPo, In idByFlow = flowRpc.getDoneAllByUserIdByFlow(qry.getProcessKey()).getData(); idByFlow.addAll(flowRpc.getFishAllByUserIdByFlow(qry.getProcessKey()).getData()); } - + if (idByFlow.size() == 0){ + throw new DataAccessException(new Error(ResponseCode.SERVER_INTERNAL_EXCEPTION, null, "鏌ヨ涓嶅埌 浠讳綍鎺堟潈淇℃伅", "")); + } Page<InComePlanOut> page = new Page<>(qry.getPageIndex(), qry.getPageSize()); List<InComePlanOut> records = InComePlanConvert.listPoToListOut(mapper.queryInComePlanApprovalPage(page, qry, idByFlow).getRecords()); for (InComePlanOut out:records) { 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 d3f2648ba0f9cbe424c947e1c3bc792ddf21744d..3c4ad403c6f7d2f6d8ae278daea3fa82f26069bf 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 @@ -145,14 +145,14 @@ public class PublicInfoController extends BaseController implements IPublicInfoC } /** - * 鍏叡璇句俊鎭甫鍒嗛〉 + * 鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤� * @param qry qry - * @return {@link Pagination < PeopleInformationOut >} + * @return {@link Pagination < SchoolStudentInformationOut >} */ - @ApiOperation("3-3.鍏叡璇句俊鎭甫鍒嗛〉") + @ApiOperation("3-3.鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤�") @Override - public Result<PublicCourseInformationOut> queryPublicCourseInformation(@RequestBody PublicCourseInformationQry qry) { - return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryPublicCourseInformation(qry)); + public Result<SchoolStudentInformationOut> querySchoolStudentInformation(@RequestBody SchoolStudentInformationQry qry) { + return ok(ResponseCode.SUCCESS, publicInfoQueryService.querySchoolStudentInformation(qry)); } /** @@ -178,14 +178,14 @@ public class PublicInfoController extends BaseController implements IPublicInfoC } /** - * 鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤� + * 鍏叡璇句俊鎭甫鍒嗛〉 * @param qry qry - * @return {@link Pagination < SchoolStudentInformationOut >} + * @return {@link Pagination < PeopleInformationOut >} */ - @ApiOperation("4-3.鍦ㄦ牎瀛︾敓淇℃伅甯﹀垎椤�") + @ApiOperation("4-3.鍏叡璇句俊鎭甫鍒嗛〉") @Override - public Result<SchoolStudentInformationOut> querySchoolStudentInformation(@RequestBody SchoolStudentInformationQry qry) { - return ok(ResponseCode.SUCCESS, publicInfoQueryService.querySchoolStudentInformation(qry)); + public Result<PublicCourseInformationOut> queryPublicCourseInformation(@RequestBody PublicCourseInformationQry qry) { + return ok(ResponseCode.SUCCESS, publicInfoQueryService.queryPublicCourseInformation(qry)); } /** @@ -259,7 +259,7 @@ public class PublicInfoController extends BaseController implements IPublicInfoC * @param cmd 閮ㄩ棬鐗规畩缁忚垂cmd * @return {@link Long} */ - @ApiOperation("7-1.淇濆瓨鏁欒亴宸ヤ汉鍧�") + @ApiOperation("7-1.淇濆瓨閮ㄩ棬鐗规畩缁忚垂") @Override public Result<Long> saveSpecialFunds(@RequestBody SpecialFundsCmd cmd) { return ok(ResponseCode.SUCCESS, publicInfoSvr.saveSpecialFunds(cmd)); @@ -270,7 +270,7 @@ public class PublicInfoController extends BaseController implements IPublicInfoC * @param ids 鍒犻櫎涓婚敭 * @return {@link Long} */ - @ApiOperation("7-2.鍒犻櫎鏁欒亴宸ヤ汉鍧�") + @ApiOperation("7-2.鍒犻櫎閮ㄩ棬鐗规畩缁忚垂") @Override public Result<Long> removeSpecialFunds(@RequestBody List<Long> ids) { return ok(ResponseCode.SUCCESS, publicInfoSvr.removeSpecialFunds(ids)); @@ -292,7 +292,7 @@ public class PublicInfoController extends BaseController implements IPublicInfoC * @param cmd 绛旇京璐筩md * @return {@link Long} */ - @ApiOperation("8-1.淇濆瓨鏁欒亴宸ヤ汉鍧�") + @ApiOperation("8-1.淇濆瓨绛旇京璐�") @Override public Result<Long> savePlea(@RequestBody PleaCmd cmd) { return ok(ResponseCode.SUCCESS, publicInfoSvr.savePlea(cmd)); @@ -303,7 +303,7 @@ public class PublicInfoController extends BaseController implements IPublicInfoC * @param ids 鍒犻櫎涓婚敭 * @return {@link Long} */ - @ApiOperation("8-2.鍒犻櫎鏁欒亴宸ヤ汉鍧�") + @ApiOperation("8-2.鍒犻櫎绛旇京璐�") @Override public Result<Long> removePlea(@RequestBody List<Long> ids) { return ok(ResponseCode.SUCCESS, publicInfoSvr.removePlea(ids));