规则添加--代码提交

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -114,7 +114,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
 
-                .antMatchers("/dht/salary").anonymous()
+                .antMatchers("/current/rule/salary").anonymous()
+                .antMatchers("/expense/source").anonymous()
                 // activiti modeler 放行
                 .antMatchers("/modeler/**").anonymous()
                 .antMatchers("/activiti/definition/upload").anonymous()

ruoyi-wages/src/main/java/com/ruoyi/system/constant/CoalConstant.java

@@ -19,9 +19,28 @@ public class CoalConstant {
      * 吕家坨矿
      */
     public final static String LJT_MINE = "011702";
+    /**
+     * 单侯
+     */
+    public final static String SH_MINE = "011204";
+    /**
+     * 范各庄矿
+     */
+    public final static String FK_MINE = "011701";
+    /**
+     * 宏丰
+     */
+    public final static String HF_MINE = "011502";
+    /**
+     * 钱家营矿
+     */
+    public final static String QJY_MINE = "010105";
+    /**
+     * 云飞
+     */
+    public final static String YF_MINE = "011504";
 
+    public final static String ONE = "1";
 
-    public final static String ONE="1";
-
-    public final static String ZERO="0";
+    public final static String ZERO = "0";
 }

ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java

@@ -22,6 +22,61 @@ public class CurrentRuleSalarySupport {
         MINE_MAP.put(CoalConstant.LJT_MINE, CurrentRuleSalarySupport::getLjtMineSalaryData);
         MINE_MAP.put(CoalConstant.LX_MINE, CurrentRuleSalarySupport::getLxMineSalaryData);
         MINE_MAP.put(CoalConstant.DHT_MINE, CurrentRuleSalarySupport::getDhtMineSalaryData);
+        MINE_MAP.put(CoalConstant.SH_MINE, CurrentRuleSalarySupport::getShMineSalaryData);
+        MINE_MAP.put(CoalConstant.FK_MINE, CurrentRuleSalarySupport::getFKMineSalaryData);
+        MINE_MAP.put(CoalConstant.HF_MINE, CurrentRuleSalarySupport::getHfMineSalaryData);
+        MINE_MAP.put(CoalConstant.QJY_MINE, CurrentRuleSalarySupport::getQjyMineSalaryData);
+        MINE_MAP.put(CoalConstant.YF_MINE, CurrentRuleSalarySupport::getYfMineSalaryData);
+    }
+
+    /**
+     * 云飞
+     *
+     * @param newRuleSalaryRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getYfMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        return getSalaryMapping(newRuleSalaryRequestModelList);
+    }
+
+    /**
+     * 钱家营矿
+     *
+     * @param newRuleSalaryRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getQjyMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        return getSalaryMapping(newRuleSalaryRequestModelList);
+    }
+
+    /**
+     * 宏丰
+     *
+     * @param newRuleSalaryRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getHfMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        return getSalaryMapping(newRuleSalaryRequestModelList);
+    }
+
+    /**
+     * 范各庄矿
+     *
+     * @param newRuleSalaryRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getFKMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        return getSalaryMapping(newRuleSalaryRequestModelList);
+    }
+
+    /**
+     * 单侯
+     *
+     * @param newRuleSalaryRequestModelList
+     * @return
+     */
+    private static List<SalaryExcelModel> getShMineSalaryData(List<NewRuleRequestModel> newRuleSalaryRequestModelList) {
+        return getSalaryMapping(newRuleSalaryRequestModelList);
     }