优化导出模板展示；干预/预警列表优化

ruoyi-admin/src/main/resources/application.yml

@@ -166,7 +166,7 @@ api-decrypt:
 springdoc:
   api-docs:
     # 是否开启接口文档
-    enabled: true
+    enabled: false
 #  swagger-ui:
 #    # 持久化认证数据
 #    persistAuthorization: true

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;
 }

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("此用户状态为无需干预，无法提交干预记录");
         }

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 + "%");

ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml

@@ -15,6 +15,15 @@
             <if test="et.situation != null">
                 and wr.situation = #{et.situation}
             </if>
+            <if test="et.interveneStatus != null">
+                and u.intervene_status = #{et.interveneStatus}
+            </if>
+            <if test="et.startTime != null and et.startTime != ''">
+                and DATE_FORMAT(wr.warn_time, '%Y-%m-%d')  &gt;= #{et.startTime}
+            </if>
+            <if test="et.endTime != null and et.endTime != ''">
+                and DATE_FORMAT(wr.warn_time, '%Y-%m-%d')  &lt;= #{et.endTime}
+            </if>
         </where>
     </select>