Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/mapper/TBDingMapper.xml

@@ -185,11 +185,11 @@
 
     <select id="count" resultType="com.qmth.sop.business.bean.result.TBDingCountResult">
         SELECT
-        sum( d.id ) total,
-        SUM( CASE WHEN d.submit_status='AGREE_DING' THEN 1 ELSE 0 END ) submitted,
-        SUM( CASE WHEN d.submit_status!='AGREE_DING' THEN 1 ELSE 0 END ) un_submitted,
-        SUM( CASE WHEN d.submit_status='AGREE_DING' THEN d.actual_days ELSE 0 END ) all_days,
-        SUM( CASE WHEN d.submit_status='AGREE_DING'  THEN d.work_hours ELSE 0 END ) all_hours
+        count( d.id ) total,
+        SUM( CASE WHEN d.submit_status='ALREADY_SUBMIT' THEN 1 ELSE 0 END ) submitted,
+        SUM( CASE WHEN d.submit_status='WILL_SUBMIT' THEN 1 ELSE 0 END ) un_submitted,
+        SUM( CASE WHEN d.submit_status='ALREADY_SUBMIT' THEN d.actual_days ELSE 0 END ) all_days,
+        SUM( CASE WHEN d.submit_status='ALREADY_SUBMIT'  THEN d.work_hours ELSE 0 END ) all_hours
         FROM
         t_b_ding_submit d
         LEFT JOIN t_b_user_archives ua ON d.user_archives_id = ua.id