diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ce10ec0..413d785 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -166,7 +166,7 @@ api-decrypt: springdoc: api-docs: # 是否开启接口文档 - enabled: true + enabled: false # swagger-ui: # # 持久化认证数据 # persistAuthorization: true diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java index 4e02009..ed2a674 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java @@ -22,4 +22,7 @@ public class BaseQueryBo { private Long recordId; private Integer status; private Integer situation; + private Integer interveneStatus; + private String startTime; + private String endTime; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java index c135837..a45e18f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java @@ -88,7 +88,8 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService @Override public Boolean insertByBo(SysInterveneRecordBo bo) { LoginUser loginUser = getLoginUser(); - SysUser sysUser = userMapper.selectById(loginUser.getUserId()); + Long userId = bo.getUserId(); + SysUser sysUser = userMapper.selectById(userId); if (sysUser.getInterveneStatus() == 0) { throw new ServiceException("此用户状态为无需干预，无法提交干预记录"); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java index d12ecd2..f887986 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -320,7 +320,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { int personTotal = maleNum + femaleNum; wordData.setPersonNum(String.valueOf(personTotal)); int malePercent = processHalfUpPercent(maleNum, personTotal); - int femalePercent = processHalfUpPercent(femaleNum, personTotal); +// int femalePercent = processHalfUpPercent(femaleNum, personTotal); + int femalePercent = 100-malePercent; wordData.setMaleNum(String.valueOf(maleNum)); wordData.setMalePercent(malePercent + "%"); wordData.setFemaleNum(String.valueOf(femaleNum)); @@ -332,7 +333,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { int undoneNum = recordMapper.selectUndoneNumByBatchNo(batchNo); int recordNum = completeNum + undoneNum; int completePercent = processHalfUpPercent(completeNum, recordNum); - int undonePercent = processHalfUpPercent(undoneNum, recordNum); +// int undonePercent = processHalfUpPercent(undoneNum, recordNum); + int undonePercent = 100-completePercent; wordData.setCompleteNum(String.valueOf(completeNum)); wordData.setCompletePercent(completePercent + "%"); @@ -345,7 +347,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { int warnNum = recordMapper.selectWarnNumByBatchNo(batchNo); int warnPercent = processHalfUpPercent(warnNum, completeNum); int normalNum = completeNum - warnNum; - int normalPercent = processHalfUpPercent(normalNum, completeNum); +// int normalPercent = processHalfUpPercent(normalNum, completeNum); + int normalPercent = 100-warnPercent; wordData.setRecordNum(String.valueOf(completeNum)); wordData.setWarnNum(String.valueOf(warnNum)); wordData.setWarnPercent(warnPercent + "%"); diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml index 1b2c5f8..bb6edf2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml @@ -15,6 +15,15 @@ and wr.situation = #{et.situation} + + and u.intervene_status = #{et.interveneStatus} + + + and DATE_FORMAT(wr.warn_time, '%Y-%m-%d') >= #{et.startTime} + + + and DATE_FORMAT(wr.warn_time, '%Y-%m-%d') <= #{et.endTime} + diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate-bak.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate-bak.docx new file mode 100644 index 0000000..7cd429c Binary files /dev/null and b/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate-bak.docx differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx index b4a1317..1d59783 100644 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx and b/ruoyi-modules/rouyi-scale/src/main/resources/word/groupTemplate.docx differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak.docx new file mode 100644 index 0000000..1ec887e Binary files /dev/null and b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate-bak.docx differ diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx index 1ec887e..45e0721 100644 Binary files a/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx and b/ruoyi-modules/rouyi-scale/src/main/resources/word/personalTemplate.docx differ