Merge branch 'release/个税版本' into release/个税&业务线

src/com/engine/salary/entity/salaryacct/bo/SalaryCalcTaxRequest.java

@@ -140,11 +140,15 @@ public class SalaryCalcTaxRequest {
      * @return
      */
     public Map<String, Object> buildQTLXLWBCRequestParam() {
+        // 人员列表
+        List<Map<String, Object>> RYLBRequestParam = EmployeeDeclareRequest.convert2RequestParam(employeeDeclares);
         List<Map<String, Object>> requestParams = buildRequestParams(IncomeCategoryEnum.REMUNERATION_FOR_OTHER_CONTINUOUS_LABOR,
                 employeeDeclares, salaryAcctEmployeeMap, salaryAcctResultValueMap);
 
         Map<String, Object> param = new HashMap<>();
-        param.put("qtlxlwbclb", Lists.newArrayList());
+        // 人员列表
+        param.put("rylb", RYLBRequestParam);
+        param.put("qtlxlwbclb", requestParams);
         // 是否传入累计个人养老金，2使用传入数据
         param.put("gryljcl", 2);
         return param;

src/com/engine/salary/enums/salarysob/IncomeCategoryEnum.java

@@ -377,7 +377,7 @@ public enum IncomeCategoryEnum implements BaseEnum<Integer> {
             return resultMap;
         }
     },
-    REMUNERATION_FOR_OTHER_CONTINUOUS_LABOR(489, "0489", "其他连续劳务报酬所得", DeclareReportTypeEnum.COMPREHENSIVE_INCOME, 181943) {
+    REMUNERATION_FOR_OTHER_CONTINUOUS_LABOR(489, "0489", "其他连续劳务报酬", DeclareReportTypeEnum.COMPREHENSIVE_INCOME, 181943) {
         @Override
         public void parseGetDeclareTaxResultFeedbackResponse(Map<String, List<List<Object>>> result, GetDeclareTaxResultFeedbackResponse declareTaxResultFeedbackResponse) {
             List<GetDeclareTaxResultFeedbackResponse.Body.zhsd.zcgzxj.zhsdscjgbw> zhsd = declareTaxResultFeedbackResponse.getBody().getZhsd().getQtlxlwbc().getSscglb();