Преглед на файлове

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

wangqiong123 преди 2 години
родител
ревизия
07a93038a5

+ 10
- 3
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationLogServiceImpl.java Целия файл

16
 import com.ruoyi.wisdomarbitrate.domain.vo.UpdateSubmitVO;
16
 import com.ruoyi.wisdomarbitrate.domain.vo.UpdateSubmitVO;
17
 import com.ruoyi.wisdomarbitrate.mapper.*;
17
 import com.ruoyi.wisdomarbitrate.mapper.*;
18
 import com.ruoyi.wisdomarbitrate.service.CaseApplicationLogService;
18
 import com.ruoyi.wisdomarbitrate.service.CaseApplicationLogService;
19
+import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
19
 import org.springframework.beans.factory.annotation.Autowired;
20
 import org.springframework.beans.factory.annotation.Autowired;
20
 import org.springframework.stereotype.Service;
21
 import org.springframework.stereotype.Service;
21
 import org.springframework.transaction.annotation.Transactional;
22
 import org.springframework.transaction.annotation.Transactional;
50
     private CaseAttachLogMapper caseAttachLogMapper;
51
     private CaseAttachLogMapper caseAttachLogMapper;
51
     @Autowired
52
     @Autowired
52
     private SmsRecordMapper smsRecordMapper;
53
     private SmsRecordMapper smsRecordMapper;
54
+    @Autowired
55
+    private ICaseApplicationService caseApplicationService;
53
     @Override
56
     @Override
54
     public int insert(CaseApplication caseApplicationLog) {
57
     public int insert(CaseApplication caseApplicationLog) {
55
         return caseApplicationLogMapper.insert(caseApplicationLog);
58
         return caseApplicationLogMapper.insert(caseApplicationLog);
233
     public AjaxResult selectCompareCase(UpdateSubmitVO vo) {
236
     public AjaxResult selectCompareCase(UpdateSubmitVO vo) {
234
         // 查询当前版本号和上一个版本号的案件
237
         // 查询当前版本号和上一个版本号的案件
235
         CaseApplication afterCase = caseApplicationLogMapper.selectByCaseIdAndVersion(vo.getCaseId(), vo.getVersion());
238
         CaseApplication afterCase = caseApplicationLogMapper.selectByCaseIdAndVersion(vo.getCaseId(), vo.getVersion());
236
-        CaseApplication beforeCase = caseApplicationLogMapper.selectBeforeCase(vo.getCaseId(), vo.getVersion());
239
+      //  CaseApplication beforeCase = caseApplicationLogMapper.selectBeforeCase(vo.getCaseId(), vo.getVersion());
240
+        CaseApplication caseApplication = new CaseApplication();
241
+        caseApplication.setCaseAppliId(vo.getCaseId());
242
+        CaseApplication beforeCase=   caseApplicationService.selectCaseApplication(caseApplication);
243
+
237
         // 查询案件关联人员
244
         // 查询案件关联人员
238
-        beforeCase.setCaseAffiliates(caseAffiliateLogMapper.selectCaseAffiliate(beforeCase.getCaseLogId()));
245
+       // beforeCase.setCaseAffiliates(caseAffiliateLogMapper.selectCaseAffiliate(beforeCase.getCaseLogId()));
239
         afterCase.setCaseAffiliates(caseAffiliateLogMapper.selectCaseAffiliate(afterCase.getCaseLogId()));
246
         afterCase.setCaseAffiliates(caseAffiliateLogMapper.selectCaseAffiliate(afterCase.getCaseLogId()));
240
         // 查询附件
247
         // 查询附件
241
         CaseAttach caseAttach = new CaseAttach();
248
         CaseAttach caseAttach = new CaseAttach();
242
         caseAttach.setCaseAppliLogId(beforeCase.getCaseLogId());
249
         caseAttach.setCaseAppliLogId(beforeCase.getCaseLogId());
243
         caseAttach.setAnnexType(2);
250
         caseAttach.setAnnexType(2);
244
         caseAttachLogMapper.getCaseAttachByCaseIdAndType(caseAttach);
251
         caseAttachLogMapper.getCaseAttachByCaseIdAndType(caseAttach);
245
-        beforeCase.setCaseAttachList(caseAttachLogMapper.getCaseAttachByCaseIdAndType(caseAttach));
252
+   //     beforeCase.setCaseAttachList(caseAttachLogMapper.getCaseAttachByCaseIdAndType(caseAttach));
246
         caseAttach.setCaseAppliLogId(afterCase.getCaseLogId());
253
         caseAttach.setCaseAppliLogId(afterCase.getCaseLogId());
247
         afterCase.setCaseAttachList(caseAttachLogMapper.getCaseAttachByCaseIdAndType(caseAttach));
254
         afterCase.setCaseAttachList(caseAttachLogMapper.getCaseAttachByCaseIdAndType(caseAttach));
248
         CompareCaseVO compareCaseVO = new CompareCaseVO();
255
         CompareCaseVO compareCaseVO = new CompareCaseVO();

+ 23
- 4
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Целия файл

782
                 FROM
782
                 FROM
783
                 case_application c
783
                 case_application c
784
                 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type = 1
784
                 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type = 1
785
-                JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1,2) and l.version
785
+                JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1, 2) and
786
+                l.version
786
                 = (
787
                 = (
787
                 SELECT
788
                 SELECT
788
                 max( version ) version
789
                 max( version ) version
791
                 WHERE case_appli_id = c.id
792
                 WHERE case_appli_id = c.id
792
                 )
793
                 )
793
                 WHERE
794
                 WHERE
794
-                ca.identity_type=1 and c.case_status in (1,5,8,9,14,15,16,17,31)
795
+                ca.identity_type=1
796
+
797
+                and c.case_status in (1,5,8,9,14,15,16,17,31)
795
       <!--          <if test="deptIds != null and deptIds.size() > 0">
798
       <!--          <if test="deptIds != null and deptIds.size() > 0">
796
                     and ca.application_organ_id in
799
                     and ca.application_organ_id in
797
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
800
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
805
                 <if test="nameId != null and nameId != ''">
808
                 <if test="nameId != null and nameId != ''">
806
                     AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
809
                     AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
807
                 </if>
810
                 </if>
808
-
809
-
811
+                union
812
+            select  c.id ,
813
+                c.case_status,ca.application_organ_id,
814
+                c.arbitrator_id,ca.identity_num , ca.identity_type
815
+                FROM
816
+                case_application c
817
+                JOIN case_application_log l ON c.id = l.case_appli_id
818
+                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
819
+                AND ca.identity_type = 1
820
+                WHERE
821
+                l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1
822
+                AND l.version = (
823
+                SELECT
824
+                max( version ) version
825
+                FROM
826
+                case_application_log
827
+                WHERE
828
+                c.id = case_appli_id)
810
             </if>
829
             </if>
811
         </trim>
830
         </trim>
812
 
831