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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseNumRuleController.java

@@ -28,6 +28,8 @@ public class CaseNumRuleController  extends BaseController {
         return caseNumRuleService.insertCaseNumRule(caseNumRule);
     }
 
+
+
     /**
      * 修改案件编号规则
      * @param caseNumRule

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

@@ -13,4 +13,8 @@ public interface CaseNumRuleMapper {
     int deleteCaseNumRule(CaseNumRule caseNumRule);
 
     List<CaseNumRule> selectCaseNumRules(CaseNumRule caseNumRule);
+
+    int countCaseNumRule(CaseNumRule caseNumRule);
+
+    CaseNumRule selectCaseNumRule(CaseNumRule caseNumRule);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseNumRuleService.java

@@ -15,4 +15,6 @@ public interface ICaseNumRuleService {
     AjaxResult deleteCaseNumRule(CaseNumRule caseNumRule);
 
     List<CaseNumRule> selectCaseNumRule(CaseNumRule caseNumRule);
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.wisdomarbitrate.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.wisdomarbitrate.domain.CaseNumRule;
 import com.ruoyi.wisdomarbitrate.mapper.CaseNumRuleMapper;
 import com.ruoyi.wisdomarbitrate.service.ICaseNumRuleService;
@@ -19,6 +20,10 @@ public class CaseNumRuleServiceImpl implements ICaseNumRuleService {
     @Override
     @Transactional
     public AjaxResult insertCaseNumRule(CaseNumRule caseNumRule) {
+        int countCaseNumRule = caseNumRuleMapper.countCaseNumRule(caseNumRule);
+        if (countCaseNumRule>0){
+            return AjaxResult.error("不能新增相同案件编号规则");
+        }
         int i = caseNumRuleMapper.insertCaseNumRule(caseNumRule);
         if (i>0){
             return AjaxResult.success("新增成功");
@@ -30,11 +35,15 @@ public class CaseNumRuleServiceImpl implements ICaseNumRuleService {
     @Override
     @Transactional
     public AjaxResult updateCaseNumRule(CaseNumRule caseNumRule) {
+        int countCaseNumRule = caseNumRuleMapper.countCaseNumRule(caseNumRule);
+        if (countCaseNumRule>0){
+            return AjaxResult.error("不能修改相同案件编号规则");
+        }
         int i = caseNumRuleMapper.updateCaseNumRule(caseNumRule);
         if (i > 0) {
             return AjaxResult.success("修改成功");
         }
-        return AjaxResult.error();
+        return AjaxResult.error("新增失败");
 
 
     }
@@ -58,4 +67,6 @@ public class CaseNumRuleServiceImpl implements ICaseNumRuleService {
     }
 
 
+
+
 }

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

@@ -56,7 +56,7 @@
     </delete>
 
     <select id="selectCaseNumRules" parameterType="CaseNumRule" resultMap="BaseResultMap">
-        SELECT  id, rule_type ,prefixstr , date_format,dept_name,dept_name_firchar
+        SELECT  id, rule_type ,prefixstr , date_format,dept_name,dept_name_firchar,current_num
         FROM  case_num_rule
         <where>
             <if test="deptNameFirchar != null and deptNameFirchar != ''">
@@ -67,4 +67,38 @@
 
 
 
+    <select id="countCaseNumRule" resultType="Integer">
+        select count(1) from  case_num_rule c
+        <where>
+            <if test="prefixstr != null  and prefixstr != '' ">
+                AND c.prefixstr  = #{prefixstr}
+            </if>
+            <if test="ruleType != null   ">
+                AND c.rule_type  = #{ruleType}
+            </if>
+            <if test="dateFormat != null   ">
+                AND c.date_format  = #{dateFormat}
+            </if>
+            <if test="deptName != null  and deptName != '' ">
+                AND c.dept_name  = #{deptName}
+            </if>
+            <if test="deptNameFirchar != null  and deptNameFirchar != '' ">
+                AND c.dept_name_firchar  = #{deptNameFirchar}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="selectCaseNumRule" parameterType="CaseNumRule" resultMap="BaseResultMap">
+        SELECT  id, rule_type ,prefixstr , date_format,dept_name,dept_name_firchar,current_num
+        FROM  case_num_rule
+        <where>
+            <if test="id != null   ">
+                AND id  = #{id}
+            </if>
+        </where>
+    </select>
+
+
+
 </mapper>