Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java

  */
 @Data
 public class ToDoCount {
-    /**
-     * 立案申请
-     */
-    private int caseApply;
-    /**
-     * 待立案审查
-     */
-    private int caseApplyCheck;
-    /**
-     * 待缴费
-     */
-    private int caseApplyPay;
-    /**
-     * 待缴费确认
-     */
-    private int caseApplyPayCheck;
-    /**
-     * 待案件质证
-     */
-    private int caseApplyEvidence;
-    /**
-     * 待组庭审核
-     */
-    private int caseApplyGroupCheck;
-    /**
-     * 待组庭确定
-     */
-    private int caseApplyGroupConfirm;
-    /**
-     * 待组庭通知
-     */
+
+    private int caseApply; // 立案申请
+    private int caseApplyCheck; // 待立案审查
+    private int caseApplyPay; // 待缴费
+    private int caseApplyPayCheck; // 待缴费确认
+    private int caseApplyEvidence; //待案件质证
+    private int caseApplyGroupCheck; // 待组庭审核
+    private int caseApplyGroupConfirm; // 待组庭确定
 //    private int caseApplyGroupNotice;
-    /**
-     * 待审核仲裁方式
-     */
-    private int caseApplyArbitrateWay;
-    /**
-     * 待开庭审理
-     */
-    private int caseApplyGroupOnline;
-    /**
-     * 待书面审理
-     */
-    private int caseApplyGroupOffline;
-    /**
-     * 待生成仲裁文书
-     */
-    private int caseApplyAward;
-    /**
-     * 待核验仲裁文书
-     */
-    private int caseApplyAwardCheck;
-    /**
-     * 待审核仲裁文书
-     */
-    private int caseApplyAwardConfirm;
-    /**
-     * 待仲裁文书签名
-     */
-    private int caseApplyAwardSign;
-    /**
-     * 待仲裁文书用印
-     */
-    private int caseApplyAwardSeal;
-    /**
-     * 待仲裁文书送达
-     */
-    private int caseApplyAwardSend;
-    /**
-     * 待案件归档
-     */
-    private int caseApplyStored;
-    /**
-     * 已归档
-     */
-    private int caseApplyArchived;
+    private int caseApplyArbitrateWay; // 待审核仲裁方式
+    private int caseApplyGroupOnline; // 待开庭审理
+    private int caseApplyGroupOffline; // 待书面审理
+    private int caseApplyAward; // 待生成仲裁文书
+    private int caseApplyAwardCheck; // 待核验仲裁文书
+    private int caseApplyAwardConfirm; // 待审核仲裁文书
+    private int caseApplyAwardSign; // 待仲裁文书签名
+    private int caseApplyAwardSeal; // 待仲裁文书用印
+    private int caseApplyAwardSend; // 待仲裁文书送达
+    private int caseApplyStored; // 待案件归档
+    private int caseApplyArchived; // 已归档
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java

         return "短信发送失败";
     }
     /**
-     * 设置字典缓存
+     * 设置验证码缓存
      *
      * @param key 参数键
-     * @param code 字典数据列表
+     * @param code 验证码
      */
     public static void setCodeCache(String key, String code)
     {

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

                 </if>
         <!--部门长-->
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
-            or t.case_status in
-            <foreach item="caseStatus" collection="deptHeadStatus" open="(" separator="," close=")">
-                #{caseStatus}
-            </foreach>
+            or (t.identity_type=1 and t.case_status in
+            <foreach item="caseStatus" collection="deptHeadStatus" open="(" separator="," close=")">#{caseStatus}
+            </foreach>)
             </if>
             <!--财务-->
             <if test="financeStatus != null and financeStatus != ''">
-                or( t.case_status =#{financeStatus})
+                or(t.identity_type=1 and t.case_status =#{financeStatus})
 
             </if>
         </where>
             </if>
             <!--申请人-->
             <if test="nameId != null and nameId != ''">
-                or( ( t.application_organ_id = #{nameId} AND t.identity_type=1
+                or ( t.application_organ_id = #{nameId} AND t.identity_type=1
                 and t.case_status in (0,2))
-                )
+
             </if>
             <!--部门长-->
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
-                or t.case_status in
+                or (t.identity_type=1 and t.case_status in
                 <foreach item="caseStatus" collection="deptHeadStatus" open="(" separator="," close=")">
                     #{caseStatus}
-                </foreach>
+                </foreach>)
             </if>
             <!--财务-->
             <if test="financeStatus != null and financeStatus != ''">
-                or( t.case_status =#{financeStatus})
+                or( t.identity_type=1 and t.case_status =#{financeStatus})
 
             </if>
         </where>
         ) t1
-<!--            &lt;!&ndash;申请人&ndash;&gt;-->
+        <!--      <where>
+                   &lt;!&ndash;申请人&ndash;&gt;-->
 <!--            <if test="nameId != null and nameId != ''">-->
 <!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
 <!--                and t1.case_status in (0,2)-->
 <!--                )-->
-<!--            </if>-->
+<!--            </if>
+        </where> -->
     </select>
 
     <select id="selectAdminCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
-        select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
+        select DISTINCT(c.id) id,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
         ELSE '无审理方式'
         END arbitratMethodName,
             sum( case when c.case_status=17 then 1 else 0 end) caseApplyArchived
         FROM
             case_application c
-                LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id
+                 JOIN case_affiliate ca ON ca.case_appli_id = c.id
                 AND ca.identity_type = 1
         WHERE
                 c.case_status IN (