代码冲突解决

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java

      */
     void updatePayType(CaseConfirmPayDTO payDTO);
 
-    /**
-     * 查询部门长案件
-     * @param caseApplication
-     * @return
-     */
-    List<CaseApplication> selectDeptHeadCaseApplicationList(@Param("caseApplication") CaseApplication caseApplication, @Param("statusList")List<Integer> caseStatusList);
 
     ToDoCount selectAdminCaseToDoCount();
 
-    ToDoCount selectDeptHeadCaseToDoCount( @Param("statusList")List<Integer> caseStatusList);
 
     ToDoCount selectTodoCountByRole(CaseApplication caseApplication);
 }

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

         List<CaseAffiliate> caseAffiliates = caseApplication.getCaseAffiliates();
         Map<String, Long> deptMap =new HashMap<>();
         if (caseAffiliates != null && caseAffiliates.size() > 0) {
-                // 查询所有的组织机构，组装成map
-                List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
-                if (CollectionUtil.isEmpty(deptList)) {
-                    deptList = new ArrayList<>();
-                }
-                 deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptName, SysDept::getDeptId,(oldV,newV)->newV));
+            // 查询所有的组织机构，组装成map
+            List<SysDept> deptList = sysDeptMapper.selectDeptList(new SysDept());
+            if (CollectionUtil.isEmpty(deptList)) {
+                deptList = new ArrayList<>();
+            }
+            deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptName, SysDept::getDeptId,(oldV,newV)->newV));
 
             for (CaseAffiliate caseAffiliate : caseAffiliates) {
                 caseAffiliate.setCaseAppliId(caseApplication.getId());
         String currentDay = DateUtils.dateTime();
         String caseNum = "zc"+ currentDay;
         //查询出当天的案件编号的最大值
-            Integer maxCaseNum =  caseApplicationMapper.selectCaseNumLike(caseNum,caseNum.length());
+        Integer maxCaseNum =  caseApplicationMapper.selectCaseNumLike(caseNum,caseNum.length());
         if(null == maxCaseNum){
             caseNum = caseNum + "001";
         }else {
 
                 }
 
-                    caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
+                caseAffiliateMapper.updataCaseAffiliate(caseAffiliate);
             }
 
         }
                     SmsUtils.sendSms(request);
                 }
             } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) {
-               return "申请机构与申请代理人不匹配";
+                return "申请机构与申请代理人不匹配";
             } else if (null != agentUser.getDeptId() && String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())){
                 // 同步用户表和案件关联人表的手机号和名称
                 caseAffiliate.setContactTelphoneAgent(agentUser.getPhonenumber());
 
                 //对不重复的立案对象集合的立案对象重新组装对应的案件关联人信息
 //                if(caseApplicationListinsertDiffer!=null&&caseApplicationListinsertDiffer.size()>0){
-                    List<CaseApplication> caseApplicationNewList = null;
-                    for (int i = 0; i < caseApplicationListinsert.size(); i++){
-                        caseApplicationNewList = new ArrayList<>();
-                        CaseApplication caseApplicationinsertDiffer = caseApplicationListinsert.get(i);
-                        // 设置自动编码
-                        caseApplicationinsertDiffer.setCaseNum(generateCaseNum());
-                        List<CaseAffiliate> caseAffiliatesnew =  new ArrayList<>();
-                        CaseApplication caseApplicationNew = new CaseApplication();
-                        copyCaseApplication(caseApplicationinsertDiffer,caseApplicationNew);
-                        if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){
-                            for (int j = 0; j < caseApplicationListinsert.size(); j++){
-                                CaseApplication  caseApplicationinsert = caseApplicationListinsert.get(j);
-
-                                if(StringUtils.isNotEmpty(caseApplicationinsert.getCaseNum())&&
-                                        caseApplicationinsert.getCaseNum().equals(caseApplicationinsertDiffer.getCaseNum())){
-
-                                    caseAffiliatesnew.addAll(caseApplicationinsert.getCaseAffiliates());
-                                }
+                List<CaseApplication> caseApplicationNewList = null;
+                for (int i = 0; i < caseApplicationListinsert.size(); i++){
+                    caseApplicationNewList = new ArrayList<>();
+                    CaseApplication caseApplicationinsertDiffer = caseApplicationListinsert.get(i);
+                    // 设置自动编码
+                    caseApplicationinsertDiffer.setCaseNum(generateCaseNum());
+                    List<CaseAffiliate> caseAffiliatesnew =  new ArrayList<>();
+                    CaseApplication caseApplicationNew = new CaseApplication();
+                    copyCaseApplication(caseApplicationinsertDiffer,caseApplicationNew);
+                    if(caseApplicationListinsert!=null&&caseApplicationListinsert.size()>0){
+                        for (int j = 0; j < caseApplicationListinsert.size(); j++){
+                            CaseApplication  caseApplicationinsert = caseApplicationListinsert.get(j);
+
+                            if(StringUtils.isNotEmpty(caseApplicationinsert.getCaseNum())&&
+                                    caseApplicationinsert.getCaseNum().equals(caseApplicationinsertDiffer.getCaseNum())){
+
+                                caseAffiliatesnew.addAll(caseApplicationinsert.getCaseAffiliates());
                             }
-                            caseApplicationNew.setCaseAffiliates(caseAffiliatesnew);
-                            caseApplicationNewList.add(caseApplicationNew);
                         }
+                        caseApplicationNew.setCaseAffiliates(caseAffiliatesnew);
+                        caseApplicationNewList.add(caseApplicationNew);
+                    }
 
-                        for (int k = 0; k < caseApplicationNewList.size(); k++){
-                            CaseApplication caseApplicationItera = caseApplicationNewList.get(k);
-                            // 新增立案信息
-                            caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
-                            caseApplicationItera.setCreateBy(getUsername());
-                            int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
-                            List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
-                            if(caseAffiliates!=null&&caseAffiliates.size()>0){
-                                for (CaseAffiliate caseAffiliate : caseAffiliates){
-                                    caseAffiliate.setCaseAppliId(caseApplicationItera.getId());
+                    for (int k = 0; k < caseApplicationNewList.size(); k++){
+                        CaseApplication caseApplicationItera = caseApplicationNewList.get(k);
+                        // 新增立案信息
+                        caseApplicationItera.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
+                        caseApplicationItera.setCreateBy(getUsername());
+                        int rows = caseApplicationMapper.insertCaseApplication(caseApplicationItera);
+                        List<CaseAffiliate> caseAffiliates = caseApplicationItera.getCaseAffiliates();
+                        if(caseAffiliates!=null&&caseAffiliates.size()>0){
+                            for (CaseAffiliate caseAffiliate : caseAffiliates){
+                                caseAffiliate.setCaseAppliId(caseApplicationItera.getId());
 
-                                }
-                                caseAffiliateMapper.batchCaseAffiliate(caseAffiliates);
                             }
-
-                            successNum++;
-                            successMsg.append("<br/>" + successNum + "、立案编号 " + caseApplicationItera.getCaseNum() + " 导入成功");
+                            caseAffiliateMapper.batchCaseAffiliate(caseAffiliates);
                         }
 
+                        successNum++;
+                        successMsg.append("<br/>" + successNum + "、立案编号 " + caseApplicationItera.getCaseNum() + " 导入成功");
+                    }
+
 //                    }
 
                 }
         }else {
             throw new ServiceException("导入立案申请数据不能为空！");
         }
-            return successMsg.append(failureMsg.toString()).toString();
+        return successMsg.append(failureMsg.toString()).toString();
 
     }
 
                                                     JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
                                                     double positionX = coordinateObj.getDoubleValue("positionX");
                                                     double positionY = coordinateObj.getDoubleValue("positionY");
-                                                    sealSignRecord.setPositionXpsn(positionX);
+                                                    sealSignRecord.setPositionXpsn(positionX+90);
                                                     sealSignRecord.setPositionYpsn(positionY);
                                                 }
                                             }else {
                                                     JSONObject coordinateObj = coordinatesArray.getJSONObject(0);
                                                     double positionX = coordinateObj.getDoubleValue("positionX");
                                                     double positionY = coordinateObj.getDoubleValue("positionY");
-                                                    sealSignRecord.setPositionXorg(positionX);
-                                                    sealSignRecord.setPositionYorg(positionY);
+                                                    sealSignRecord.setPositionXorg(positionX-10);
+                                                    sealSignRecord.setPositionYorg(positionY+10);
                                                 }
                                             }
                                         }
             for(int i = 0;i < idStrList.length;i ++ ){
                 idList.add(Long.parseLong(idStrList[i]));
             }
-                    // 查询仲裁员电话号
-                 List<SysUser> userList=   sysUserMapper.selectUserListByIds(idList);
-                 if(CollectionUtil.isNotEmpty(userList)) {
-                     for (SysUser user : userList) {
-                     //给仲裁员发送短信通知
-                     request.setPhone(user.getPhonenumber());
-                     // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
-                     String name = user.getNickName();
-                     request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
-                     SmsUtils.sendSms(request);
-
-                     }
-                 }
+            // 查询仲裁员电话号
+            List<SysUser> userList=   sysUserMapper.selectUserListByIds(idList);
+            if(CollectionUtil.isNotEmpty(userList)) {
+                for (SysUser user : userList) {
+                    //给仲裁员发送短信通知
+                    request.setPhone(user.getPhonenumber());
+                    // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
+                    String name = user.getNickName();
+                    request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
+                    SmsUtils.sendSms(request);
+
+                }
+            }
 
         }
 
                 CaseAffiliate caseAffiliateselect = caseAffiliatListeselect.get(j);
                 int identityType = caseAffiliateselect.getIdentityType();
                 if(identityType==1){
-                  caseAffiliateselect.setName(caseAffiliateselect.getApplicationOrganName());
+                    caseAffiliateselect.setName(caseAffiliateselect.getApplicationOrganName());
 
                 }
                 //给申请人、被申请人发送短信通知
 
 
     private void assignmentCaseAffiliates(CaseApplication caseApplication, List<CaseAffiliate> caseAffiliatesnew, Map<String, Long> deptMap) {
-       // 申请人信息
+        // 申请人信息
         CaseAffiliate caseAffiliate = new CaseAffiliate();
 
 //        BeanUtils.copyBeanProp(caseApplication,caseAffiliate);
         if(StrUtil.isNotEmpty(s)){
             StringBuilder errorMsg = caseApplication.getErrorMsg();
             if(StrUtil.isEmpty(errorMsg)){
-             errorMsg=new StringBuilder();
+                errorMsg=new StringBuilder();
             }
             errorMsg.append(s);
             caseApplication.setErrorMsg(errorMsg);
 
 
 
-            // 将组织机构id设为申请人名称
-            if(deptMap.containsKey(caseApplication.getName())){
-                caseAffiliate.setApplicationOrganId(String.valueOf(deptMap.get(caseApplication.getName())));
-                caseAffiliate.setApplicationOrganName(caseApplication.getName());
-            }else {
-               // 如果不存在则新增
-                SysDept dept = new SysDept();
-                dept.setParentId(0L);
-                dept.setDeptName(caseApplication.getName());
-                dept.setAncestors("0");
-                dept.setOrderNum(1);
-                dept.setStatus("0");
-                dept.setDelFlag("0");
-                dept.setCreateBy(getUsername());
-                dept.setUpdateBy(getUsername());
-                sysDeptMapper.insertDept(dept);
-                deptMap.put(dept.getDeptName(),dept.getDeptId());
-                caseAffiliate.setApplicationOrganId(String.valueOf(dept.getDeptId()));
-                caseAffiliate.setApplicationOrganName(caseApplication.getName());
+        // 将组织机构id设为申请人名称
+        if(deptMap.containsKey(caseApplication.getName())){
+            caseAffiliate.setApplicationOrganId(String.valueOf(deptMap.get(caseApplication.getName())));
+            caseAffiliate.setApplicationOrganName(caseApplication.getName());
+        }else {
+            // 如果不存在则新增
+            SysDept dept = new SysDept();
+            dept.setParentId(0L);
+            dept.setDeptName(caseApplication.getName());
+            dept.setAncestors("0");
+            dept.setOrderNum(1);
+            dept.setStatus("0");
+            dept.setDelFlag("0");
+            dept.setCreateBy(getUsername());
+            dept.setUpdateBy(getUsername());
+            sysDeptMapper.insertDept(dept);
+            deptMap.put(dept.getDeptName(),dept.getDeptId());
+            caseAffiliate.setApplicationOrganId(String.valueOf(dept.getDeptId()));
+            caseAffiliate.setApplicationOrganName(caseApplication.getName());
 
-            }
+        }
 
     }
 

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

             </if>
         </where>
         ) t1
-        <!--        <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>-->
-        <!--        </where>-->
+
         order by t1.create_time desc,t1.case_num desc
     </select>
     <select id="selectTodoCountByRole" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount">
             </if>
         </where>
         ) t1
-        <!--      <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>
-                </where> -->
     </select>
 
     <select id="selectAdminCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
                 )
 
     </select>
-    <select id="selectDeptHeadCaseApplicationList" parameterType="CaseApplication" resultMap="CaseApplicationResult">
-        select c.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,
-        c.case_status ,
-        CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
-        when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
-        when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
-        when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
-        when 12 then '待审核仲裁文书' when 13 then '待仲裁文书签名' when 14 then '待仲裁文书用印'
-        when 15 then '待仲裁文书送达' when 16 then '待案件归档' when 17 then '已归档'
-        ELSE '无案件状态'
-        END caseStatusName,
-        c.hear_date ,c.arbitrat_claims ,
-        c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
-        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
-        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
-        from case_application c
-        LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
-        <where>
-            c.case_status in
-            <foreach item="caseStatus" collection="statusList" open="(" separator="," close=")">
-                #{caseStatus}
-            </foreach>
-            <if test="caseApplication.caseStatus != null">
-                AND c.case_status = #{caseApplication.caseStatus}
-            </if>
-            <if test="caseApplication.caseNum != null and caseApplication.caseNum != ''">
-                AND c.case_num = #{caseApplication.caseNum}
-            </if>
-            <if test="caseApplication.nameId != null and caseApplication.nameId != ''">
-                AND ca.application_organ_id=#{caseApplication.nameId}  AND ca.identity_type=1
-            </if>
-            <if test="caseApplication.caseStatusList != null and caseApplication.caseStatusList.size() > 0">
-                and c.case_status in
-                <foreach item="caseStatus" collection="caseApplication.caseStatusList" open="(" separator="," close=")">
-                    #{caseStatus}
-                </foreach>
-            </if>
-        </where>
-        order by c.create_time desc,c.case_num desc
-    </select>
-    <select id="selectDeptHeadCaseToDoCount" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount">
-        select  sum( case when c.case_status=0 then 1 else 0 end) caseApply,
-        sum( case when c.case_status=1 then 1 else 0 end) caseApplyCheck,
-        sum( case when c.case_status=2 then 1 else 0 end) caseApplyPay,
-        sum( case when c.case_status=3 then 1 else 0 end) caseApplyPayCheck,
-        sum( case when c.case_status=4 then 1 else 0 end) caseApplyEvidence,
-        sum( case when c.case_status=5 then 1 else 0 end) caseApplyGroupCheck,
-        sum( case when c.case_status=6 then 1 else 0 end) caseApplyGroupConfirm,
-        sum( case when c.case_status=7 then 1 else 0 end) caseApplyArbitrateWay,
-        sum( case when c.case_status=8 then 1 else 0 end) caseApplyGroupOnline,
-        sum( case when c.case_status=9 then 1 else 0 end) caseApplyGroupOffline,
-        sum( case when c.case_status=10 then 1 else 0 end) caseApplyAward,
-        sum( case when c.case_status=11 then 1 else 0 end) caseApplyAwardCheck,
-        sum( case when c.case_status=12 then 1 else 0 end) caseApplyAwardConfirm,
-        sum( case when c.case_status=13 then 1 else 0 end) caseApplyAwardSign,
-        sum( case when c.case_status=14 then 1 else 0 end) caseApplyAwardSeal,
-        sum( case when c.case_status=15 then 1 else 0 end) caseApplyAwardSend,
-        sum( case when c.case_status=16 then 1 else 0 end) caseApplyStored,
-        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 AND ca.identity_type=1
-        <where>
-            <!--部门长-->
-            <if test="statusList != null and statusList.size() > 0">
-                or c.case_status in
-                <foreach item="caseStatus" collection="statusList" open="(" separator="," close=")">
-                    #{caseStatus}
-                </foreach>
-                <!--被申请人-->
-                <if test="idCard != null and idCard != ''">
-                    or (t.identity_num=#{idCard} AND t.identity_type=2 and t.case_status=4)
-                </if>
-                <!--仲裁员-->
-                <if test="userId != null and userId != ''">
-                    or ( t.identity_type=1 and
-                    t.case_status in (7,8,9,12,13,14)
-                    and
-                    instr (t.arbitrator_id,#{userId})>0)
-                </if>
-                <!--法律顾问-->
-                <if test="deptIds != null and deptIds.size() > 0">
-                    or (t.identity_type=1 and t.case_status in (1,5,11,15,16)
-                    and t.application_organ_id in
-                    <foreach item="item" collection="deptIds" open="(" separator="," close=")">
-                        #{item}
-                    </foreach> )
-                </if>
-                <!--申请人-->
-                <if test="nameId != null and nameId != ''">
-                    or( ( t.application_organ_id = #{nameId} AND t.identity_type=1
-                    and t.case_status in (0,2))
-                    )
-                </if>
-            </if>
-        </where>
-
-    </select>
 
 
     <select id="selectCaseApplicationCount" parameterType="CaseApplication" resultType="int">