Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01

# Conflicts:
#	src/com/engine/salary/sys/constant/SalarySysConstant.java
#	src/com/engine/salary/sys/entity/vo/AppSettingVO.java
#	src/com/engine/salary/sys/service/SalarySysConfService.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/web/SalarySystemConfigController.java
#	src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java

src/com/engine/salary/sys/constant/SalarySysConstant.java

@@ -71,6 +71,11 @@ public class SalarySysConstant {
      */
     public static final String SALARY_PAYROLL_CHECK_TYPE = "SALARY_PAYROLL_CHECK_TYPE";
 
+    /**
+     * 个税申报撤回
+     */
+    public static final  String WITHDRAW_TAX_DECLARATION ="WITHDRAW_TAX_DECLARATION";
+
     /**
      * 删除薪资档案
      */

src/com/engine/salary/sys/entity/vo/AppSettingVO.java

@@ -70,6 +70,11 @@ public class AppSettingVO {
      */
     private String salaryAcctEmployeeRule;
 
+    /**
+     * 撤回个税申报表
+     */
+    private String withDrawTaxDeclaration;
+
     /**
      * 薪资档案删除
      */

src/com/engine/salary/sys/service/SalarySysConfService.java

@@ -97,6 +97,12 @@ public interface SalarySysConfService {
      */
     void saveSalaryAcctEmployeeRule(String rule);
 
+    /**
+     * 个税申报撤回开关
+     * @param param
+     */
+    void saveWithDrawTaxDeclaration(SalarySysConfPO param);
+
     /**
      * 保存档案删除规则
      * @param setting

src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java

@@ -416,6 +416,15 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
         saveSettingByType(rule, SALARY_ACCT_EMPLOYEE_RULE, "薪资、社保福利核算包含人员规则", "basic");
     }
 
+    @Override
+    public void saveWithDrawTaxDeclaration(SalarySysConfPO param) {
+        if (StringUtils.isBlank(param.getConfValue())) {
+            throw new SalaryRunTimeException("无效规则！");
+        }
+
+        saveSettingByType(param.getConfValue(), WITHDRAW_TAX_DECLARATION, "个税申报撤回", "basic");
+    }
+
     @Override
     public void saveArchiveDelete(String setting) {
         if (StringUtils.isBlank(setting)) {
@@ -496,6 +505,14 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
             appSettingVO.setSalaryAcctEmployeeRule( SalaryAcctEmployeeRuleEnum.parseByValue(salaryAcctEmployeeRule.getConfValue()).getValue() );
         }
 
+        SalarySysConfPO withDrawRule = salarySysConfMap.get(WITHDRAW_TAX_DECLARATION);
+        if (withDrawRule == null ) {
+            // 个税申报撤回
+            appSettingVO.setWithDrawTaxDeclaration("0");
+        } else {
+            appSettingVO.setWithDrawTaxDeclaration( withDrawRule.getConfValue() );
+        }
+
         SalarySysConfPO salaryArchiveDeletePO = salarySysConfMap.get(SALARY_ARCHIVE_DELETE);
         if (salaryArchiveDeletePO == null ) {
             // 是否允许删除薪资、社保档案，默认不允许删除

src/com/engine/salary/web/SalarySystemConfigController.java

@@ -188,6 +188,14 @@ public class SalarySystemConfigController {
         return new ResponseResult<String, String>(user).run(getSalarySystemConfigWrapper(user)::saveSalaryAcctEmployeeRule, param.getRule());
     }
 
+    @POST
+    @Path("/saveWithDrawTaxDeclaration")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String saveWithDrawTaxDeclaration(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySysConfPO param) {
+        User user = HrmUserVarify.getUser(request, response);
+        return new ResponseResult<SalarySysConfPO, String>(user).run(getSalarySystemConfigWrapper(user)::saveWithDrawTaxDeclaration, param);
+    }
+
     /**
      * 删除档案
      * @param request

src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java

@@ -144,6 +144,10 @@ public class SalarySystemConfigWrapper extends Service {
         getSalarySysConfService(user).saveSalaryAcctEmployeeRule(rule);
     }
 
+    public void saveWithDrawTaxDeclaration(SalarySysConfPO param) {
+        getSalarySysConfService(user).saveWithDrawTaxDeclaration(param);
+    }
+
     public void saveArchiveDelete(String setting) {
         getSalarySysConfService(user).saveArchiveDelete(setting);
     }