From 4cebd898ab3b7bffc706afb7cff6868e681c193d Mon Sep 17 00:00:00 2001 From: lucky Date: Fri, 31 Dec 2021 14:52:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/carbasics/service/AccountManageService.java | 2 +- .../com/ccsens/carbasics/service/QuestionnaireService.java | 5 +++-- src/main/resources/application.yml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java index ac2644e..4ad8bea 100644 --- a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java +++ b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java @@ -88,7 +88,7 @@ public class AccountManageService implements IAccountManageService { boolean flag = true; //1.校验字段是否都填写 Integer num = questionnaireDetailDao.countCodeNumber(detailId); - if (num < 22) { + if (num < 23) { flag = false; } String answer = questionnaireDetailDao.queryXGZL(detailId); diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index b4f966a..09f55aa 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -186,7 +186,8 @@ public class QuestionnaireService implements IQuestionnaireService{ List stringList = new ArrayList<>(); stringList.add("QXXWJ"); List qxxwj = codeDictionariesDao.query(stringList); - if (num <= qxxwj.size()) { + log.info("QXXWJ数量:{}",qxxwj.size()); + if (num < (qxxwj.size()-1)) { throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE); } String answer = questionnaireDetailDao.queryXGZL(param.getDetailId()); @@ -195,7 +196,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..5abf242 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: prod + include: common, util-prod From af2a381924de963228f0dc092c0a5a89142bb422 Mon Sep 17 00:00:00 2001 From: lucky Date: Tue, 4 Jan 2022 11:37:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java | 2 ++ src/main/resources/application.yml | 4 ++-- src/main/resources/mapper_dao/AccountManageDao.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java index 65e414a..d60ac7d 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java @@ -60,6 +60,8 @@ public class AccountVo { private String positionCode; @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)") private Byte auditStatus; + @ApiModelProperty("数据来源(0-账户,1-问卷)") + private Byte dataFrom; public String getPhone() { return DesensitizedUtils.mobilePhone(phone); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5abf242..b6d2d10 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod + active: pre + include: common, util-pre diff --git a/src/main/resources/mapper_dao/AccountManageDao.xml b/src/main/resources/mapper_dao/AccountManageDao.xml index c305d99..4b98983 100644 --- a/src/main/resources/mapper_dao/AccountManageDao.xml +++ b/src/main/resources/mapper_dao/AccountManageDao.xml @@ -13,7 +13,8 @@ department_code, position_name AS position, position_code, - audit_status + audit_status, + data_from FROM t_qcp_account_manage WHERE From 081ab87b6bed1f1b6b10a7b82b02001f83457302 Mon Sep 17 00:00:00 2001 From: lucky Date: Tue, 4 Jan 2022 15:36:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/carbasics/api/QuestionnaireController.java | 10 +++++++++- .../com/ccsens/carbasics/bean/vo/OrganizationVo.java | 1 - .../carbasics/bean/vo/message/RemindMessageVo.java | 2 ++ src/main/resources/application.yml | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java index 1817f3c..5050ed7 100644 --- a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java +++ b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java @@ -127,7 +127,15 @@ public class QuestionnaireController { // 未添加时间条件 Workbook workbook = questionnaireService.export(export); log.info("导出问卷记录结束"); - String fileName = "山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx"; + String str = ""; + if (1L == export.getQid()) { + str = "2021年1-6月"; + }else if (3L == export.getQid()) { + str = "2021年7-11月"; + }else if (4L == export.getQid()) { + str = "2021年7-12月"; + } + String fileName = str+"山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx"; response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8)); workbook.write(response.getOutputStream()); } diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java index f45eb30..e143663 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java @@ -2,7 +2,6 @@ package com.ccsens.carbasics.bean.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javafx.geometry.Pos; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java index fed9969..432bd1d 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java @@ -3,7 +3,9 @@ package com.ccsens.carbasics.bean.vo.message; import com.ccsens.carbasics.util.Constant; import com.ccsens.util.message.BaseMessageDto; import lombok.Data; +import lombok.EqualsAndHashCode; +@EqualsAndHashCode(callSuper = true) @Data public class RemindMessageVo extends BaseMessageDto { private Data data; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b6d2d10..5abf242 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: pre - include: common, util-pre + active: prod + include: common, util-prod From 1f20d70e435b386324421b167f22537198cb9a94 Mon Sep 17 00:00:00 2001 From: lucky Date: Thu, 6 Jan 2022 18:19:06 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper_dao/AreaDao.xml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/resources/mapper_dao/AreaDao.xml b/src/main/resources/mapper_dao/AreaDao.xml index 0973442..8a8e20b 100644 --- a/src/main/resources/mapper_dao/AreaDao.xml +++ b/src/main/resources/mapper_dao/AreaDao.xml @@ -17,23 +17,19 @@