From a11142efa0298344ca7cbeffb051168089e876b0 Mon Sep 17 00:00:00 2001 From: lucky Date: Tue, 28 Dec 2021 11:22:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/carbasics/api/DebugController.java | 2 +- .../service/QuestionnaireService.java | 6 ++--- src/main/resources/application.yml | 4 ++-- src/main/resources/druid-test.yml | 2 +- .../resources/mapper_dao/OrganizationDao.xml | 23 ++++++++----------- .../OrganizationMemberPositionDao.xml | 2 +- .../mapper_dao/QuestionnaireRecordDao.xml | 2 ++ 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/api/DebugController.java b/src/main/java/com/ccsens/carbasics/api/DebugController.java index 50afd34..f436fd8 100644 --- a/src/main/java/com/ccsens/carbasics/api/DebugController.java +++ b/src/main/java/com/ccsens/carbasics/api/DebugController.java @@ -63,7 +63,7 @@ public class DebugController { }) @RequestMapping(value="",method = {RequestMethod.GET, RequestMethod.POST},produces = {"application/json;charset=UTF-8"}) public JsonResponse debug() throws Exception { - addData(); +// addData(); return JsonResponse.newInstance().ok("测试"); } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index f7454d3..d627ea9 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -107,7 +107,7 @@ public class QuestionnaireService implements IQuestionnaireService{ Object o = redisUtil.get(param.getDetailId() + "" + userId); log.info("redis保存问卷用户{},{}",param.getDetailId() + "" + userId,o); if (ObjectUtil.isNull(o)) { - redisUtil.set(param.getDetailId() + "" + userId,userId); + redisUtil.set(param.getDetailId() + "" + userId,param.getCode()); //查询是否已经提交,已提交不能保存修改 QuestionnaireDetail questionnaireDetail = questionnaireDetailDao.selectByPrimaryKey(param.getDetailId()); if (Constant.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) { @@ -177,7 +177,7 @@ public class QuestionnaireService implements IQuestionnaireService{ List stringList = new ArrayList<>(); stringList.add("QXXWJ"); List qxxwj = codeDictionariesDao.query(stringList); - if (num <= qxxwj.size()) { + if (num < qxxwj.size()-1) { throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE); } String answer = questionnaireDetailDao.queryXGZL(param.getDetailId()); @@ -186,7 +186,7 @@ public class QuestionnaireService implements IQuestionnaireService{ sonCode.add("XGZL"); List xgzl = codeDictionariesDao.query(sonCode); Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId()); - if (sonOfXGZLNum <= xgzl.size()) { + if (sonOfXGZLNum < xgzl.size()) { throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3b11fb..2fb38e5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/src/main/resources/druid-test.yml b/src/main/resources/druid-test.yml index 7dcd6cc..02c6182 100644 --- a/src/main/resources/druid-test.yml +++ b/src/main/resources/druid-test.yml @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://test.tall.wiki/carbasics_bak?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://test.tall.wiki/carbasics?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file diff --git a/src/main/resources/mapper_dao/OrganizationDao.xml b/src/main/resources/mapper_dao/OrganizationDao.xml index ef9d17b..4846909 100644 --- a/src/main/resources/mapper_dao/OrganizationDao.xml +++ b/src/main/resources/mapper_dao/OrganizationDao.xml @@ -830,25 +830,22 @@ WHERE rec_status = 0 AND member_id = ( SELECT id FROM t_organization_member WHERE rec_status = 0 AND user_id = #{userId} ) - AND department_id = ( + AND position_id = ( SELECT - od.id + op.id FROM + t_organization_position AS op, + t_organization_department AS od, t_organization AS o - LEFT JOIN t_organization_department AS od ON od.organization_id = o.id WHERE - o.rec_status = 0 + op.department_id = od.id + AND od.organization_id = o.id + AND op.rec_status = 0 + AND od.rec_status = 0 + AND o.rec_status = 0 AND o.`name` = #{name} AND od.`name` = #{departmentName} - ) - AND position_id = ( - SELECT - id - FROM - t_organization_position - WHERE - rec_status = 0 - AND `name` = #{positionName} + AND op.`name` = #{positionName} ) diff --git a/src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml b/src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml index a5d5142..70fdd04 100644 --- a/src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml +++ b/src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml @@ -20,7 +20,7 @@