瀏覽代碼

查询修改

18792927508 2 年之前
父節點
當前提交
bc1579ef95

+ 19
- 75
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/ToDoCount.java 查看文件

9
  */
9
  */
10
 @Data
10
 @Data
11
 public class ToDoCount {
11
 public class ToDoCount {
12
-    /**
13
-     * 立案申请
14
-     */
15
-    private int caseApply;
16
-    /**
17
-     * 待立案审查
18
-     */
19
-    private int caseApplyCheck;
20
-    /**
21
-     * 待缴费
22
-     */
23
-    private int caseApplyPay;
24
-    /**
25
-     * 待缴费确认
26
-     */
27
-    private int caseApplyPayCheck;
28
-    /**
29
-     * 待案件质证
30
-     */
31
-    private int caseApplyEvidence;
32
-    /**
33
-     * 待组庭审核
34
-     */
35
-    private int caseApplyGroupCheck;
36
-    /**
37
-     * 待组庭确定
38
-     */
39
-    private int caseApplyGroupConfirm;
40
-    /**
41
-     * 待组庭通知
42
-     */
12
+
13
+    private int caseApply; // 立案申请
14
+    private int caseApplyCheck; // 待立案审查
15
+    private int caseApplyPay; // 待缴费
16
+    private int caseApplyPayCheck; // 待缴费确认
17
+    private int caseApplyEvidence; //待案件质证
18
+    private int caseApplyGroupCheck; // 待组庭审核
19
+    private int caseApplyGroupConfirm; // 待组庭确定
43
 //    private int caseApplyGroupNotice;
20
 //    private int caseApplyGroupNotice;
44
-    /**
45
-     * 待审核仲裁方式
46
-     */
47
-    private int caseApplyArbitrateWay;
48
-    /**
49
-     * 待开庭审理
50
-     */
51
-    private int caseApplyGroupOnline;
52
-    /**
53
-     * 待书面审理
54
-     */
55
-    private int caseApplyGroupOffline;
56
-    /**
57
-     * 待生成仲裁文书
58
-     */
59
-    private int caseApplyAward;
60
-    /**
61
-     * 待核验仲裁文书
62
-     */
63
-    private int caseApplyAwardCheck;
64
-    /**
65
-     * 待审核仲裁文书
66
-     */
67
-    private int caseApplyAwardConfirm;
68
-    /**
69
-     * 待仲裁文书签名
70
-     */
71
-    private int caseApplyAwardSign;
72
-    /**
73
-     * 待仲裁文书用印
74
-     */
75
-    private int caseApplyAwardSeal;
76
-    /**
77
-     * 待仲裁文书送达
78
-     */
79
-    private int caseApplyAwardSend;
80
-    /**
81
-     * 待案件归档
82
-     */
83
-    private int caseApplyStored;
84
-    /**
85
-     * 已归档
86
-     */
87
-    private int caseApplyArchived;
21
+    private int caseApplyArbitrateWay; // 待审核仲裁方式
22
+    private int caseApplyGroupOnline; // 待开庭审理
23
+    private int caseApplyGroupOffline; // 待书面审理
24
+    private int caseApplyAward; // 待生成仲裁文书
25
+    private int caseApplyAwardCheck; // 待核验仲裁文书
26
+    private int caseApplyAwardConfirm; // 待审核仲裁文书
27
+    private int caseApplyAwardSign; // 待仲裁文书签名
28
+    private int caseApplyAwardSeal; // 待仲裁文书用印
29
+    private int caseApplyAwardSend; // 待仲裁文书送达
30
+    private int caseApplyStored; // 待案件归档
31
+    private int caseApplyArchived; // 已归档
88
 }
32
 }

+ 2
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java 查看文件

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

+ 8
- 6
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml 查看文件

199
             </if>
199
             </if>
200
             <!--申请人-->
200
             <!--申请人-->
201
             <if test="nameId != null and nameId != ''">
201
             <if test="nameId != null and nameId != ''">
202
-                or( ( t.application_organ_id = #{nameId} AND t.identity_type=1
202
+                or ( t.application_organ_id = #{nameId} AND t.identity_type=1
203
                 and t.case_status in (0,2))
203
                 and t.case_status in (0,2))
204
-                )
204
+
205
             </if>
205
             </if>
206
             <!--部门长-->
206
             <!--部门长-->
207
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
207
             <if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
217
             </if>
217
             </if>
218
         </where>
218
         </where>
219
         ) t1
219
         ) t1
220
-<!--            &lt;!&ndash;申请人&ndash;&gt;-->
220
+        <!--      <where>
221
+                   &lt;!&ndash;申请人&ndash;&gt;-->
221
 <!--            <if test="nameId != null and nameId != ''">-->
222
 <!--            <if test="nameId != null and nameId != ''">-->
222
 <!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
223
 <!--                and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
223
 <!--                and t1.case_status in (0,2)-->
224
 <!--                and t1.case_status in (0,2)-->
224
 <!--                )-->
225
 <!--                )-->
225
-<!--            </if>-->
226
+<!--            </if>
227
+        </where> -->
226
     </select>
228
     </select>
227
 
229
 
228
     <select id="selectAdminCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
230
     <select id="selectAdminCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
229
-        select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
231
+        select DISTINCT(c.id) id,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
230
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
232
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
231
         ELSE '无审理方式'
233
         ELSE '无审理方式'
232
         END arbitratMethodName,
234
         END arbitratMethodName,
288
             sum( case when c.case_status=17 then 1 else 0 end) caseApplyArchived
288
             sum( case when c.case_status=17 then 1 else 0 end) caseApplyArchived
289
         FROM
289
         FROM
290
             case_application c
290
             case_application c
291
-                LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id
291
+                 JOIN case_affiliate ca ON ca.case_appli_id = c.id
292
                 AND ca.identity_type = 1
292
                 AND ca.identity_type = 1
293
         WHERE
293
         WHERE
294
                 c.case_status IN (
294
                 c.case_status IN (