Quellcode durchsuchen

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into qtz

qitz vor 2 Jahren
Ursprung
Commit
26117e8de4

+ 1
- 26
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java Datei anzeigen

56
             "    AND a.respondent_identity_num = #{req.respondentIdentityNum} " +
56
             "    AND a.respondent_identity_num = #{req.respondentIdentityNum} " +
57
             "</if> "
57
             "</if> "
58
             +
58
             +
59
-            "<if test=\"req.hearDateFlag != null \">" +
60
-            "    AND c.mediation_method = '1'" +
61
-            "</if> "
62
-            +
63
             "<if test=\"req.startTime != null and req.startTime != ''\">"  +
59
             "<if test=\"req.startTime != null and req.startTime != ''\">"  +
64
             "and c.create_time &gt;= #{req.startTime}</if>" +
60
             "and c.create_time &gt;= #{req.startTime}</if>" +
65
             "<if test=\"req.endTime != null and req.endTime != ''\">" +
61
             "<if test=\"req.endTime != null and req.endTime != ''\">" +
78
             "</foreach>" +
74
             "</foreach>" +
79
             "</if> "
75
             "</if> "
80
             +
76
             +
81
-            "<if test=\"req.batchNumber != null and req.batchNumber != ''\">" +
82
-            "    AND c1.batch_number = #{req.batchNumber} " +
83
-            "</if> " +
84
             "<if test=\"req.caseFlowId != null \">" +
77
             "<if test=\"req.caseFlowId != null \">" +
85
             "    AND c1.case_flow_id = #{req.caseFlowId} " +
78
             "    AND c1.case_flow_id = #{req.caseFlowId} " +
86
             "</if> " +
79
             "</if> " +
91
             "    AND a1.respondent_identity_num = #{req.respondentIdentityNum} " +
84
             "    AND a1.respondent_identity_num = #{req.respondentIdentityNum} " +
92
             "</if> "
85
             "</if> "
93
             +
86
             +
94
-            "<if test=\"req.hearDateFlag != null \">" +
95
-            "    AND c1.mediation_method = '1'" +
96
-            "</if> "
97
-            +
98
-
99
             "<if test=\"req.startTime != null and req.startTime != ''\">"  +
87
             "<if test=\"req.startTime != null and req.startTime != ''\">"  +
100
             "and c1.create_time &gt;= #{req.startTime}</if>" +
88
             "and c1.create_time &gt;= #{req.startTime}</if>" +
101
             "<if test=\"req.endTime != null and req.endTime != ''\">"  +
89
             "<if test=\"req.endTime != null and req.endTime != ''\">"  +
102
             "and c1.create_time &lt;= #{req.endTime}</if>" +
90
             "and c1.create_time &lt;= #{req.endTime}</if>" +
103
             "        </where> " +
91
             "        </where> " +
104
             "                    ) "
92
             "                    ) "
105
-//            +
106
-//            "<if test='caseStatusNames != null and caseStatusNames.size() > 0 '> and  c.case_status_name in" +
107
-//            "<foreach item='caseStatus' index='index' collection='caseStatusNames' open='(' separator=',' close=')'>" +
108
-//            "#{caseStatus}" +
109
-//            "</foreach>" +
110
-//            "</if> "
111
-            +
112
-            "<if test=\"req.batchNumber != null and req.batchNumber != ''\">" +
113
-            "    AND c.batch_number = #{req.batchNumber} " +
114
-            "</if> " +
93
+             +
115
             "<if test=\"req.caseFlowId != null \">" +
94
             "<if test=\"req.caseFlowId != null \">" +
116
             "    AND c.case_flow_id = #{req.caseFlowId} " +
95
             "    AND c.case_flow_id = #{req.caseFlowId} " +
117
             "</if> " +
96
             "</if> " +
122
             "    AND a.respondent_identity_num = #{req.respondentIdentityNum} " +
101
             "    AND a.respondent_identity_num = #{req.respondentIdentityNum} " +
123
             "</if> "
102
             "</if> "
124
             +
103
             +
125
-            "<if test=\"req.hearDateFlag != null \">" +
126
-            "    AND c.mediation_method = '1'" +
127
-            "</if> "
128
-            +
129
 
104
 
130
             "<if test=\"req.startTime != null and req.startTime != ''\">"  +
105
             "<if test=\"req.startTime != null and req.startTime != ''\">"  +
131
             "and c.create_time &gt;= #{req.startTime}</if>" +
106
             "and c.create_time &gt;= #{req.startTime}</if>" +

+ 10
- 30
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java Datei anzeigen

149
     public List<MsCaseApplicationVO> list(MsCaseApplicationReq req) {
149
     public List<MsCaseApplicationVO> list(MsCaseApplicationReq req) {
150
         // admin查询所有案件
150
         // admin查询所有案件
151
         if (StrUtil.equals(SecurityUtils.getUsername(), "admin")) {
151
         if (StrUtil.equals(SecurityUtils.getUsername(), "admin")) {
152
-
153
-            if(req.getHearDateFlag()!=null){
154
-                // todo 暂时写死
155
-                req.setCaseFlowId(9);
156
-            }
157
             startPage();
152
             startPage();
158
-
159
             return msCaseApplicationMapper.list(req, null);
153
             return msCaseApplicationMapper.list(req, null);
160
         }
154
         }
161
         // 根据用户查询角色
155
         // 根据用户查询角色
184
         Map<String, MsCaseFlow> flowMap = caseFlows.stream().collect(Collectors.toMap(MsCaseFlow::getButtonAuthFlag, Function.identity()));
178
         Map<String, MsCaseFlow> flowMap = caseFlows.stream().collect(Collectors.toMap(MsCaseFlow::getButtonAuthFlag, Function.identity()));
185
         List<String> caseStatusNames = caseFlows.stream().map(MsCaseFlow::getCaseStatusName).collect(Collectors.toList());
179
         List<String> caseStatusNames = caseFlows.stream().map(MsCaseFlow::getCaseStatusName).collect(Collectors.toList());
186
         for (SysRole role : roles) {
180
         for (SysRole role : roles) {
187
-            if(StrUtil.isNotEmpty(role.getRoleName())&&StrUtil.equals(role.getRoleName(),"申请人")){
188
-                req.setApplicantFlag(1);
189
-                break;
190
-
191
-            }
192
-            if(StrUtil.isNotEmpty(role.getRoleName())&&StrUtil.equals(role.getRoleName(),"被申请人")){
193
-                caseStatusNames=new ArrayList<>();
194
-                // todo 被申请人案件根据被申请人身份证号查询案件列表
195
-                req.setRespondentIdentityNum(sysUser.getIdCard());
196
-                MsCaseFlow caseFlow =null;
197
-                // todo 查询待调解流程id被申请人暂时写死
198
-                if(req.getMiniProgressFlag()!=null) {
199
-                    if (req.getHearDateFlag() != null) {
200
-//                     caseFlow = flowMap.get("caseManagement:list:mediate");
201
-                        caseStatusNames.add("待调解");
202
-                    } else {
203
-                        // 待选择调解员
204
-                        caseStatusNames.add("待选择调解员");
205
-                    }
206
-                }else {
207
-                    // PC端
208
-                    caseStatusNames.add("待被申请人签收");
181
+            if(StrUtil.isNotEmpty(role.getRoleName())){
182
+                if(StrUtil.equals(role.getRoleName(),"申请人")) {
183
+                    caseStatusNames.add("待调解");
184
+                    break;
185
+                }
186
+                if(StrUtil.equals(role.getRoleName(),"被申请人")){
187
+                    caseStatusNames.add("待调解");
188
+                    req.setRespondentIdentityNum(sysUser.getIdCard());
189
+                    break;
209
                 }
190
                 }
210
-
211
-                break;
212
             }
191
             }
213
         }
192
         }
214
         startPage();
193
         startPage();
904
             if (StrUtil.isNotEmpty(affiliate.getRespondentPhone())) {
883
             if (StrUtil.isNotEmpty(affiliate.getRespondentPhone())) {
905
                 String sendContent = "尊敬的" + affiliate.getRespondentName() + "用户,您的" + application.getCaseNum() + "仲裁案件,已成功受理,请知晓,如非本人操作,请忽略本短信";
884
                 String sendContent = "尊敬的" + affiliate.getRespondentName() + "用户,您的" + application.getCaseNum() + "仲裁案件,已成功受理,请知晓,如非本人操作,请忽略本短信";
906
                 // 给被申请人发送案件受理短信 尊敬的{1}用户,您的{2}仲裁案件,已成功受理,请知晓,如非本人操作,请忽略本短信
885
                 // 给被申请人发送案件受理短信 尊敬的{1}用户,您的{2}仲裁案件,已成功受理,请知晓,如非本人操作,请忽略本短信
886
+                // todo 发送申请人注册小程序短信
907
                 Boolean smsFlag = SmsUtils.sendSms(application.getId(), "2049503", affiliate.getRespondentPhone(), new String[]{affiliate.getRespondentName(), application.getCaseNum()});
887
                 Boolean smsFlag = SmsUtils.sendSms(application.getId(), "2049503", affiliate.getRespondentPhone(), new String[]{affiliate.getRespondentName(), application.getCaseNum()});
908
                 CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getNodeName(), "向被申请人发送短信," + sendContent);
888
                 CaseLogUtils.insertCaseLog(application.getId(), caseFlow.getNodeId(), caseFlow.getNodeName(), "向被申请人发送短信," + sendContent);
909
                 SmsSendRecord smsSendRecord = new SmsSendRecord(application.getId(), application.getCaseNum(), affiliate.getRespondentPhone(), new Date(), sendContent);
889
                 SmsSendRecord smsSendRecord = new SmsSendRecord(application.getId(), application.getCaseNum(), affiliate.getRespondentPhone(), new Date(), sendContent);

+ 1
- 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml Datei anzeigen

49
     </resultMap>
49
     </resultMap>
50
 	
50
 	
51
 	<sql id="selectUserVo">
51
 	<sql id="selectUserVo">
52
-        select u.user_id, u.user_name, u.nick_name,u.specialty, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
52
+        select u.user_id, u.user_name, u.nick_name,u.specialty, u.id_card,u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
53
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card
53
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card
54
         from ms_sys_user u
54
         from ms_sys_user u
55
 		    left join ms_sys_user_role ur on u.user_id = ur.user_id
55
 		    left join ms_sys_user_role ur on u.user_id = ur.user_id