Merge remote-tracking branch 'origin/V0.1.0' into V0.1.0

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -768,14 +768,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             reportVo.setOrgName(org.getName());
             reportVo.setShouldFinish(0);
             reportVo.setFinish(0);
-            reportVo.setFinishRate("0%");
+            reportVo.setFinishRate("0.00%");
             result.add(reportVo);
         }
     }
 
     public static String calculatePercent(Integer num1, Integer num2) {
         if (num1 == 0 || num2 == 0) {
-            return "0%";
+            return "0.00%";
         }
         BigDecimal a1 = new BigDecimal(num1);
         BigDecimal a2 = new BigDecimal(num2);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/controller/SafetyInspectReportController.java

@@ -68,8 +68,8 @@ public class SafetyInspectReportController {
         if (ObjectUtil.equal(1,safetyInspectDTO.getCycle())){
             safetyInspectDTO.setStartTime(DateUtil.beginOfMonth(DateUtil.parse(safetyInspectDTO.getDate().get(0))));
             safetyInspectDTO.setEndTime(DateUtil.endOfMonth(DateUtil.parse(safetyInspectDTO.getDate().get(1))));
-            String startStr = DateUtils.parseDateToStr("yyyy-MM",safetyInspectDTO.getStartTime());
-            String endStr = DateUtils.parseDateToStr("yyyy-MM",safetyInspectDTO.getEndTime());
+            String startStr = DateUtil.format(safetyInspectDTO.getStartTime(), "yyyy-MM");
+            String endStr = DateUtil.format(safetyInspectDTO.getEndTime(), "yyyy-MM");
             title = "网点负责人自查情况表(" + startStr + "至"+endStr+")";
             safetyInspectDTO.setYear(null);
         }else {

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -90,13 +90,13 @@
         core_drill_task t
         LEFT JOIN sys_user u ON t.host_id = u.id
         LEFT JOIN sys_org d ON t.org_id = d.id
-        <where>
+        where d.deleted=0 and d.is_lock=0
             <choose>
                 <when test="request.checkSub==true">
-                    t.org_path like concat(#{request.orgPath}, '%')
+                    and   t.org_path like concat(#{request.orgPath}, '%')
                 </when>
                 <otherwise>
-                    t.org_id = #{request.orgId}
+                    and t.org_id = #{request.orgId}
                 </otherwise>
             </choose>
             <if test="request.title!= null and request.title !=''">
@@ -112,7 +112,6 @@
                 and t.status in(2,3)
             </if>
             <include refid="timeRangeSql"/>
-        </where>
         order by field(t.status,5,0,1,2,3,4),t.title desc
     </select>
 

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -87,7 +87,7 @@
         core_edu_training_task t
         LEFT JOIN sys_user u ON t.host_id = u.id
         LEFT JOIN sys_org d ON t.org_id = d.id
-        <where>
+        where d.deleted=0 and d.is_lock=0
             <choose>
                 <when test="request.checkSub==true">
                     t.org_path like concat(#{request.orgPath}, '%')
@@ -106,7 +106,6 @@
                 and t.status=#{request.status}
             </if>
             <include refid="timeRangeSql"/>
-        </where>
         order by field(t.status,1,4,0,2,3),t.title desc
     </select>
 

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -78,7 +78,7 @@
         IF
         ( a.`status` = 3, 1, 0 ))= 0
         OR COUNT( a.id )= 0,
-        '0%',
+        '0.00%',
         CONCAT(
         ROUND(
         IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 ) / IFNULL( COUNT( a.id ), 0 )* 100,
@@ -86,7 +86,7 @@
         ),
         '%'
         )),
-        '0%'
+        '0.00%'
         ) AS inspectRate
         FROM
         core_safety_task a
@@ -124,7 +124,7 @@
         ROUND( SUM( IF ( a.`status` = 3, 1, 0 ))/ COUNT( a.id )* 100, 2 ),
         '%'
         ),
-        '0%'
+        '0.00%'
         ) AS inspectCoverRate
         FROM
         core_safety_task a
@@ -169,7 +169,7 @@
         ),
         '%'
         ),
-        '0%'
+        '0.00%'
         ) AS rectificationRate
         FROM
         core_question a
@@ -214,7 +214,7 @@
         ),
         '%'
         ),
-        '0%'
+        '0.00%'
         ) AS inspectRate
         FROM
         core_safety_task a