更新总账勾稽代码，增加校验规则

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/action/DiffconfigListAction.java

@@ -37,6 +37,12 @@ public class DiffconfigListAction extends BaseAction {
     public void  rule_list1 (HttpServletRequest request, HttpServletResponse response, @RequestBody RuleListModel RuleListModelDemo){
         sendData(response,diffconfigListservice.rule_list1(RuleListModelDemo));
     }
+
+    @RequestMapping("/jiaoyan")
+    @SysLog(funcName="差异容忍度规则校验")
+    public void  jiaoyan (HttpServletRequest request, HttpServletResponse response, @RequestBody DiffconfigListModel diffconfigListModel){
+        sendData(response,diffconfigListservice.jiaoyan(diffconfigListModel));
+    }
     @RequestMapping("/diffconfig_deleteone")
     @SysLog(funcName="总分勾稽规则的删除")
     public void diffconfig_deleteone(HttpServletRequest request, HttpServletResponse response,@RequestParam String ruleNo){

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/action/RuleListAction.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
-@RequestMapping("/product/rwa/resultList/RuletListAction")
+@RequestMapping("/product/rwa/resultList/RuleListAction")
 public class RuleListAction  extends BaseAction {
     @Autowired
     private RuleListService RuletListservice;

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/mapper/DiffconfigListMapper.java

@@ -11,6 +11,7 @@ public interface DiffconfigListMapper {
     public List<RuleListModel> rule_list(RuleListModel RuleListModelDemo);
     public List<RuleListModel> rule_list1(RuleListModel RuleListModelDemo);
     Boolean diffconfig_addone (DiffconfigListModel diffconfigListModel) ;
+    Boolean diffconfig_deleteone1(@Param("ruleNo") String ruleNo);
     void diffconfig_addone1 (@Param("list") List<RuleListModel> RuleListModelDemo) ;
     void  diffconfig_deleteone(@Param("ruleNo") String ruleNo);
     public List<Object> rule_querylist1 (@Param("ruleNo") String ruleNo);

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/mybatis/DiffconfigListMapper.xml

@@ -73,6 +73,18 @@
         ,ONOROFF as onoroff
         from RWA_OBJ_CONF_GL_RECONCILIATION t1
         where t1.YESORNO ='1'
+        <if test="glCode !=null and glCode!=''">
+            and GL_CODE like concat('%',#{glCode},'%')
+        </if>
+        <if test="subjectDesc !=null and subjectDesc!=''">
+            and SUBJECT_DESC like concat('%',#{subjectDesc},'%')
+        </if>
+        <if test="subjectNature !=null and subjectNature!=''">
+            and SUBJECT_NATURE =#{subjectNature}
+        </if>
+        <if test="onoroff !=null and onoroff!=''">
+            and ONOROFF =#{onoroff}
+        </if>
     </select>
 
     <insert id="diffconfig_addone" parameterType="com.sundata.product.rwa.resultList.model.DiffconfigListModel">
@@ -83,6 +95,9 @@
     <delete id="diffconfig_deleteone" parameterType="com.sundata.product.rwa.resultList.model.RuleListModel">
         delete from RWA_CALC_CONF_DIFFTOLERANCERANGE where RULE_NO =#{ruleNo}
     </delete>
+    <delete id="diffconfig_deleteone1" parameterType="com.sundata.product.rwa.resultList.model.DiffconfigListModel">
+        delete from RWA_CALC_CONF_DIFFTOLERANCE where RULE_NO =#{ruleNo}
+    </delete>
     <insert id="diffconfig_addone1" parameterType="com.sundata.product.rwa.resultList.model.RuleListModel">
         INSERT INTO RWA_CALC_CONF_DIFFTOLERANCERANGE(CALCINDEX,SDATE,EDATE,TERM,DATA_DATE,RULE_NO,ROLE_LEDGERCHECK_NO)
         VALUES

Procedure/backend/project/src/main/java/com/sundata/product/rwa/resultList/service/DiffconfigListService.java

@@ -1,5 +1,6 @@
 package com.sundata.product.rwa.resultList.service;
 
+import com.sundata.common.util.DBExecutor;
 import com.sundata.product.rwa.resultList.mapper.DiffconfigListMapper;
 import com.sundata.product.rwa.resultList.model.DiffconfigListModel;
 import com.sundata.product.rwa.resultList.model.RuleListModel;
@@ -27,8 +28,13 @@ public class DiffconfigListService {
     public List<RuleListModel> rule_list1(RuleListModel RuleListModelDemo){
         return diffconfigListMapper.rule_list1(RuleListModelDemo);
     }
+    public Integer jiaoyan(DiffconfigListModel diffconfigListModel){
+        int a = Integer.parseInt(DBExecutor.doQuery("select count(1) from RWA_CALC_CONF_DIFFTOLERANCE where RULE_NO='"+diffconfigListModel.getRuleNo()+"'"));
+        return a;
+    }
 
     public String diffconfig_deleteone(String ruleNo){
+        diffconfigListMapper.diffconfig_deleteone1(ruleNo);
         diffconfigListMapper.diffconfig_deleteone(ruleNo);
         return "删除成功";
     }
@@ -51,6 +57,7 @@ public class DiffconfigListService {
 
 
     public String diffconfig_addone(DiffconfigListModel diffconfigListModel){
+        diffconfigListMapper.diffconfig_deleteone1(diffconfigListModel.getRuleNo());
         diffconfigListMapper.diffconfig_addone(diffconfigListModel);
         System.out.println(diffconfigListModel);
         return "新增成功";