From 503dd09f0636860a95ec5170f92969892a877ffc Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Sun, 25 Apr 2021 11:20:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E5=9B=9E=E6=BB=9A=20=E6=96=B0=E5=A2=9E=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=9E=B6=E6=9E=84=E6=A0=A1=E9=AA=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/api/SystemSetttingApi.java | 7 +++- .../controller/SystemSettingController.java | 6 +++ .../tms/service/SystemSetttingService.java | 2 + .../impl/SystemSettingServiceImpl.java | 40 +++++++++++++++++-- src/main/resources/mapper/tms/UserInfoDao.xml | 2 +- 5 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/SystemSetttingApi.java b/src/main/java/com/msdw/tms/api/SystemSetttingApi.java index 85fe3c9..4524c35 100644 --- a/src/main/java/com/msdw/tms/api/SystemSetttingApi.java +++ b/src/main/java/com/msdw/tms/api/SystemSetttingApi.java @@ -23,10 +23,10 @@ public interface SystemSetttingApi { public R queryStaff(StaffVo staffVo); @ApiOperation(value = "查看员工详情",notes = "查看员工详情") - public R querystaffDetail( Integer userId); + public R querystaffDetail(Integer userId); @ApiOperation(value = "编辑员工信息",notes = "编辑员工信息") - public R updateStaff( StaffVo staffVo); + public R updateStaff(StaffVo staffVo); @ApiOperation(value = "删除员工信息",notes = "删除员工信息") public R deleteStaff(StaffVo staffVo); @@ -48,6 +48,9 @@ public interface SystemSetttingApi { @ApiOperation(value = "查询账号信息",notes = "查询账号信息") public R queryAccount(String account,Integer schoolId); + + @ApiOperation(value = "验证架构账号信息返回具体错误信息",notes = "验证架构账号信息返回具体错误信息") + public R queryStaffInfo(StaffVo staffVo); } diff --git a/src/main/java/com/msdw/tms/controller/SystemSettingController.java b/src/main/java/com/msdw/tms/controller/SystemSettingController.java index 8ce92a7..3a25dfa 100644 --- a/src/main/java/com/msdw/tms/controller/SystemSettingController.java +++ b/src/main/java/com/msdw/tms/controller/SystemSettingController.java @@ -183,6 +183,12 @@ public class SystemSettingController implements SystemSetttingApi { return result; } + @Override + @PostMapping("/queryStaffInfo") + public R queryStaffInfo(@RequestBody StaffVo staffVo) { + return systemSetttingService.queryStaffInfo(staffVo); + } + /** * 重置密码 * @param userId diff --git a/src/main/java/com/msdw/tms/service/SystemSetttingService.java b/src/main/java/com/msdw/tms/service/SystemSetttingService.java index 64864be..28dc400 100644 --- a/src/main/java/com/msdw/tms/service/SystemSetttingService.java +++ b/src/main/java/com/msdw/tms/service/SystemSetttingService.java @@ -40,4 +40,6 @@ public interface SystemSetttingService { List queryUserIdsByGradeId(Integer staffGradeId); List queryUserIdsByProfessionalId(Integer staffProfessionalArchitectureId); + + R queryStaffInfo(StaffVo staffVo); } diff --git a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java index 0dff1d7..d7c3f47 100644 --- a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java @@ -184,19 +184,19 @@ public class SystemSettingServiceImpl implements SystemSetttingService { if (phone != null && phone != "") { List resultP = userInfoDao.queryPhone(phone); if (resultP.size() > 0) { - return R.error(400, "手机号不能重复"); + throw new RuntimeException("手机号不能重复"); } } if (email != null && email != "") { List resultE = userInfoDao.queryEmail(email); if (resultE.size() > 0) { - return R.error(400, "手机号不能重复"); + throw new RuntimeException("邮箱不能重复"); } } if (resultA.size() > 0) { - return R.error(400, "账号不能重复"); + throw new RuntimeException("账号不能重复"); } else if (resultW.size() > 0) { - return R.error(400, "工号不能重复"); + throw new RuntimeException("工号不能重复"); } boolean resultUserInfo = userInfoDao.updateUserInfo(staffVo); // String[] split = staffVo.getRoleId().split(","); @@ -761,4 +761,36 @@ public class SystemSettingServiceImpl implements SystemSetttingService { return systemSetttingDao.queryUserIdsByProfessionalId(staffProfessionalArchitectureId); } + @Override + public R queryStaffInfo(StaffVo staffVo) { + staffVo.setPlatformId(ConstantUtils.PLATFORMID); + String account = staffVo.getAccount(); + String phone = staffVo.getPhone(); + String email = staffVo.getEmail(); + String workNumber = staffVo.getWorkNumber(); + + userInfoDao.setNUM(staffVo.getUserId());//重置账号、手机号码为00 + + List resultA = userInfoDao.queryAccount(account); + List resultW = systemSetttingDao.queryWorkNumber(workNumber); + if (phone != null && phone != "") { + List resultP = userInfoDao.queryPhone(phone); + if (resultP.size() > 0) { + return R.error(400,"手机号不能重复"); + } + } + if (email != null && email != "") { + List resultE = userInfoDao.queryEmail(email); + if (resultE.size() > 0) { + return R.error(400,"邮箱不能重复"); + } + } + if (resultA.size() > 0) { + return R.error(400,"账号不能重复"); + } else if (resultW.size() > 0) { + return R.error(400,"工号不能重复"); + } + return R.ok(); + } + } \ No newline at end of file diff --git a/src/main/resources/mapper/tms/UserInfoDao.xml b/src/main/resources/mapper/tms/UserInfoDao.xml index b8160b5..1104149 100644 --- a/src/main/resources/mapper/tms/UserInfoDao.xml +++ b/src/main/resources/mapper/tms/UserInfoDao.xml @@ -204,7 +204,7 @@ UPDATE hr_user_info u SET - u.account = '00',u.phone = null + u.account = '00',u.phone = null,u.email = null WHERE userId = #{userId} From eb5853485c9985ee5f3e3fdc361981c30c3f06c7 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Mon, 26 Apr 2021 14:59:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=81=8C=E7=AB=99=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/api/SystemSetttingApi.java | 3 +- .../controller/SystemSettingController.java | 5 --- .../tms/service/SystemSetttingService.java | 1 - .../impl/SystemSettingServiceImpl.java | 33 ------------------- 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/SystemSetttingApi.java b/src/main/java/com/msdw/tms/api/SystemSetttingApi.java index 4524c35..4941aaa 100644 --- a/src/main/java/com/msdw/tms/api/SystemSetttingApi.java +++ b/src/main/java/com/msdw/tms/api/SystemSetttingApi.java @@ -49,8 +49,7 @@ public interface SystemSetttingApi { @ApiOperation(value = "查询账号信息",notes = "查询账号信息") public R queryAccount(String account,Integer schoolId); - @ApiOperation(value = "验证架构账号信息返回具体错误信息",notes = "验证架构账号信息返回具体错误信息") - public R queryStaffInfo(StaffVo staffVo); + } diff --git a/src/main/java/com/msdw/tms/controller/SystemSettingController.java b/src/main/java/com/msdw/tms/controller/SystemSettingController.java index 3a25dfa..48f3346 100644 --- a/src/main/java/com/msdw/tms/controller/SystemSettingController.java +++ b/src/main/java/com/msdw/tms/controller/SystemSettingController.java @@ -183,11 +183,6 @@ public class SystemSettingController implements SystemSetttingApi { return result; } - @Override - @PostMapping("/queryStaffInfo") - public R queryStaffInfo(@RequestBody StaffVo staffVo) { - return systemSetttingService.queryStaffInfo(staffVo); - } /** * 重置密码 diff --git a/src/main/java/com/msdw/tms/service/SystemSetttingService.java b/src/main/java/com/msdw/tms/service/SystemSetttingService.java index 28dc400..93f0865 100644 --- a/src/main/java/com/msdw/tms/service/SystemSetttingService.java +++ b/src/main/java/com/msdw/tms/service/SystemSetttingService.java @@ -41,5 +41,4 @@ public interface SystemSetttingService { List queryUserIdsByProfessionalId(Integer staffProfessionalArchitectureId); - R queryStaffInfo(StaffVo staffVo); } diff --git a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java index d7c3f47..8cf15a3 100644 --- a/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/SystemSettingServiceImpl.java @@ -760,37 +760,4 @@ public class SystemSettingServiceImpl implements SystemSetttingService { public List queryUserIdsByProfessionalId(Integer staffProfessionalArchitectureId) { return systemSetttingDao.queryUserIdsByProfessionalId(staffProfessionalArchitectureId); } - - @Override - public R queryStaffInfo(StaffVo staffVo) { - staffVo.setPlatformId(ConstantUtils.PLATFORMID); - String account = staffVo.getAccount(); - String phone = staffVo.getPhone(); - String email = staffVo.getEmail(); - String workNumber = staffVo.getWorkNumber(); - - userInfoDao.setNUM(staffVo.getUserId());//重置账号、手机号码为00 - - List resultA = userInfoDao.queryAccount(account); - List resultW = systemSetttingDao.queryWorkNumber(workNumber); - if (phone != null && phone != "") { - List resultP = userInfoDao.queryPhone(phone); - if (resultP.size() > 0) { - return R.error(400,"手机号不能重复"); - } - } - if (email != null && email != "") { - List resultE = userInfoDao.queryEmail(email); - if (resultE.size() > 0) { - return R.error(400,"邮箱不能重复"); - } - } - if (resultA.size() > 0) { - return R.error(400,"账号不能重复"); - } else if (resultW.size() > 0) { - return R.error(400,"工号不能重复"); - } - return R.ok(); - } - } \ No newline at end of file From 8f7e96826630099270a788ee606e662fa5a14430 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Wed, 28 Apr 2021 18:13:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=81=8C=E7=AB=99=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AchievementManagementController.java | 7 +-- .../resources/application-prod.properties | 52 ++++++++++++++++++ .../resources/application-test.properties | 53 +++++++++++++++++++ src/main/resources/application.properties | 2 + 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/application-prod.properties create mode 100644 src/main/resources/application-test.properties create mode 100644 src/main/resources/application.properties diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 269de60..9e7e683 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -2,14 +2,15 @@ package com.msdw.tms.controller; import com.github.pagehelper.PageInfo; import com.msdw.tms.api.AchievementManagementApi; -import com.msdw.tms.common.utils.PageUtils; import com.msdw.tms.common.utils.R; -import com.msdw.tms.entity.*; +import com.msdw.tms.entity.ExperimentalReportEntity; +import com.msdw.tms.entity.ProjectRecordEntity; +import com.msdw.tms.entity.ReportEntity; +import com.msdw.tms.entity.ResultsEntity; import com.msdw.tms.entity.vo.AchievementManagementVO; import com.msdw.tms.entity.vo.ResultsVo; import com.msdw.tms.service.AchievementManagementService; import com.msdw.tms.service.ProjectRecordService; -import com.msdw.tms.util.ListPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..5f04b88 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,52 @@ +server.port=9090 +server.servlet.context-path=/evaluation + +#\u6B63\u5F0F\u6570\u636E\u5E93\u8FDE\u63A5 +spring.datasource.url=jdbc:mysql://rm-wz90d92p0pf083nxzno.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.username=root +spring.datasource.password=HuoRan@2021 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jackson.default-property-inclusion=non_null + +# \u8FD9\u4E2A\u914D\u7F6E\u4F1A\u5C06\u6267\u884C\u7684sql\u6253\u5370\u51FA\u6765\uFF0C\u5728\u5F00\u53D1\u6216\u6D4B\u8BD5\u7684\u65F6\u5019\u53EF\u4EE5\u7528 +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +mybatis-plus.mapper-locations=classpath:/mapper/**/*.xml +mybatis-plus.global-config.db-config.id-type=auto +mybatis-plus.global-config.db-config.logic-delete-field=is_del +mybatis-plus.global-config.db-config.logic-delete-value=0 +mybatis-plus.global-config.db-config.logic-not-delete-value=1 + +tms.thread.core-size=20 +tms.thread.max-size=200 +tms.thread.keep-alive-time=10 + +#redis\u914D\u7F6E +spring.redis.database=0 +spring.redis.host=127.0.0.1 +spring.redis.password= +spring.redis.port=6379 +spring.redis.timeout=3000 +spring.redis.jedis.pool.max-idle=500 +spring.redis.jedis.pool.min-idle=50 +spring.redis.jedis.pool.max-active=2000 +spring.redis.jedis.pool.max-wait=1000 + +#\u65E5\u5FD7\u7EA7\u522B +logging.level.jdbc=OFF +logging.level.jdbc.sqltiming=DEBUG +logging.level.jdbc.resultsettable=DEBUG +logging.level.com.yipin.liuwar.mapper=DEBUG +logging.level.com.yipin.liuwanr.mapper=DEBUG + +spring.elasticsearch.rest.uris=http://es-cn-v641e944a0006xtwy.elasticsearch.aliyuncs.com:9200 +spring.elasticsearch.rest.username=elastic +spring.elasticsearch.rest.password=1qaz@WSX + +# maxFileSize \u5355\u4E2A\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxFileSize = 1024MB +# maxRequestSize \u662F\u603B\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxRequestSize=10240MB + +pagehelper.reasonable=false + diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties new file mode 100644 index 0000000..90f87dd --- /dev/null +++ b/src/main/resources/application-test.properties @@ -0,0 +1,53 @@ +server.port=9090 +server.servlet.context-path=/evaluation + +#\u6D4B\u8BD5\u6570\u636E\u5E93\u8FDE\u63A5 +spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.username=super +spring.datasource.password=huoran888 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jackson.default-property-inclusion=non_null + +# \u8FD9\u4E2A\u914D\u7F6E\u4F1A\u5C06\u6267\u884C\u7684sql\u6253\u5370\u51FA\u6765\uFF0C\u5728\u5F00\u53D1\u6216\u6D4B\u8BD5\u7684\u65F6\u5019\u53EF\u4EE5\u7528 +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +mybatis-plus.mapper-locations=classpath:/mapper/**/*.xml +mybatis-plus.global-config.db-config.id-type=auto +mybatis-plus.global-config.db-config.logic-delete-field=is_del +mybatis-plus.global-config.db-config.logic-delete-value=0 +mybatis-plus.global-config.db-config.logic-not-delete-value=1 + +#\u591A\u7EBF\u7A0B\u914D\u7F6E +tms.thread.core-size=20 +tms.thread.max-size=200 +tms.thread.keep-alive-time=10 + +#redis\u914D\u7F6E +spring.redis.database=0 +spring.redis.host=www.liuwanr.cn +spring.redis.password=huoran +spring.redis.port=6379 +spring.redis.timeout=3000 +spring.redis.jedis.pool.max-idle=500 +spring.redis.jedis.pool.min-idle=50 +spring.redis.jedis.pool.max-active=2000 +spring.redis.jedis.pool.max-wait=1000 + +#\u65E5\u5FD7\u7EA7\u522B +logging.level.jdbc=OFF +logging.level.jdbc.sqltiming=DEBUG +logging.level.jdbc.resultsettable=DEBUG +logging.level.com.yipin.liuwar.mapper=DEBUG +logging.level.com.yipin.liuwanr.mapper=DEBUG + +spring.elasticsearch.rest.uris=http://es-cn-v641e944a0006xtwy.elasticsearch.aliyuncs.com:9200 +spring.elasticsearch.rest.username=elastic +spring.elasticsearch.rest.password=1qaz@WSX + +# maxFileSize \u5355\u4E2A\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxFileSize = 1024MB +# maxRequestSize \u662F\u603B\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxRequestSize=10240MB + +pagehelper.reasonable=false + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..bab924b --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,2 @@ +#\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u53EA\u6709\u6D4B\u8BD5\u548C\u6B63\u5F0F\u73AF\u5883 +spring.profiles.active=prod \ No newline at end of file From bde3f0d3b357b8abb7cf508693310bbf2ea5c8de Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Sat, 8 May 2021 10:58:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/msdw/tms/controller/UserInfoController.java | 2 +- src/main/java/com/msdw/tms/dao/UserInfoDao.java | 3 ++- src/main/java/com/msdw/tms/service/UserInfoService.java | 3 +-- .../com/msdw/tms/service/impl/UserInfoServiceImpl.java | 8 ++------ src/main/resources/mapper/tms/UserInfoDao.xml | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/msdw/tms/controller/UserInfoController.java b/src/main/java/com/msdw/tms/controller/UserInfoController.java index 1ea72ce..b15eabe 100644 --- a/src/main/java/com/msdw/tms/controller/UserInfoController.java +++ b/src/main/java/com/msdw/tms/controller/UserInfoController.java @@ -184,7 +184,7 @@ public class UserInfoController implements UserInfoControllerApi { String password = userInfo.getPassword(); //验证账号是否存在 - int num = userInfoService.queryAccountExist(userInfo.getAccount()); + int num = userInfoService.queryAccountExist(userInfo.getAccount(),userInfo.getUserId()); if (num >= 1){ return R.error(500,"更新失败，账号不能重复"); } diff --git a/src/main/java/com/msdw/tms/dao/UserInfoDao.java b/src/main/java/com/msdw/tms/dao/UserInfoDao.java index ccdb1fc..ab8e947 100644 --- a/src/main/java/com/msdw/tms/dao/UserInfoDao.java +++ b/src/main/java/com/msdw/tms/dao/UserInfoDao.java @@ -5,6 +5,7 @@ import com.msdw.tms.entity.StudentEntity; import com.msdw.tms.entity.UserInfoEntity; import com.msdw.tms.entity.vo.*; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -67,5 +68,5 @@ public interface UserInfoDao extends BaseMapper { Integer getUserId(String token); - Integer queryAccountExist(String account); + Integer queryAccountExist(@Param("account") String account,@Param("userId") Integer userId); } diff --git a/src/main/java/com/msdw/tms/service/UserInfoService.java b/src/main/java/com/msdw/tms/service/UserInfoService.java index 59b44e0..fa0e25c 100644 --- a/src/main/java/com/msdw/tms/service/UserInfoService.java +++ b/src/main/java/com/msdw/tms/service/UserInfoService.java @@ -9,7 +9,6 @@ import com.msdw.tms.entity.vo.StudentVo; import com.msdw.tms.entity.vo.UserProsonalEntityVo; import java.util.HashMap; -import java.util.List; import java.util.Map; public interface UserInfoService extends IService { @@ -50,5 +49,5 @@ public interface UserInfoService extends IService { R getUserId(String token); - Integer queryAccountExist(String account); + Integer queryAccountExist(String account,Integer userId); } diff --git a/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java index 3559522..507194e 100644 --- a/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java @@ -11,11 +11,7 @@ import com.msdw.tms.dao.UserDao; import com.msdw.tms.dao.UserInfoDao; import com.msdw.tms.entity.StudentEntity; import com.msdw.tms.entity.UserInfoEntity; -import com.msdw.tms.entity.response.CommonCode; -import com.msdw.tms.entity.response.ResponseResult; -import com.msdw.tms.entity.response.ResultCode; import com.msdw.tms.entity.vo.CheckVo; -import com.msdw.tms.entity.vo.StaffVo; import com.msdw.tms.entity.vo.StudentVo; import com.msdw.tms.entity.vo.UserProsonalEntityVo; import com.msdw.tms.service.UserInfoService; @@ -229,7 +225,7 @@ public class UserInfoServiceImpl extends ServiceImpl \ No newline at end of file From 99c568fecafb40a8fc6d294cd01ca25200963219 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Sat, 8 May 2021 11:46:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/AchievementManagementDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index f0d3822..4bb4c02 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -597,7 +597,8 @@ AND s.isdel = 0 AND u.isdel = 0 AND sch.isdel = 0 - AND re.isdel = 0; + AND re.isdel = 0 + order by r.submitTime desc From 85ab08a249e13807e301bbca6e9046aef1ca60ec Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Sat, 8 May 2021 14:17:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=88=86=E6=95=B0bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/AchievementManagementDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 4bb4c02..c7593e8 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -418,7 +418,7 @@ WHERE hjp.judgmentPointsId = hsi.judgmentPointsId AND hjp.judgmentPointsId = hec.judgmentPointsId AND p.codeId = hec.codeId - + AND hec.projectId = hsi.projectId AND hjp.isdel = 0 AND hec.recordId = #{recordId} GROUP BY hec.codeId