Merge branch 'feature/qt' into develop

src/com/engine/salary/cmd/datacollection/AddUpSituationGetDetailListCmd.java

@@ -88,7 +88,7 @@ public class AddUpSituationGetDetailListCmd extends AbstractCommonCommand<Map<St
                 "        (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation GROUP BY employee_id) t ON" +
                 "        t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month" +
                 "        LEFT JOIN hrmresource e ON e.id = t1.employee_id" +
-                "        LEFT JOIN hrmdepartment d ON d.id = e.department" +
+                "        LEFT JOIN hrmdepartment d ON d.id = e.departmentid" +
                 "        LEFT JOIN hrsa_tax_agent t2 ON t1.tax_agent_id = t2.id";
 
         SalaryWeaTable<AddUpSituationRecordDTO> table = new SalaryWeaTable<AddUpSituationRecordDTO>(user, AddUpSituationRecordDTO.class);

src/com/engine/salary/cmd/datacollection/AddUpSituationListCmd.java

@@ -62,7 +62,7 @@ public class AddUpSituationListCmd extends AbstractCommonCommand<Map<String, Obj
                 "        (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation GROUP BY employee_id) t ON" +
                 "        t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month" +
                 "        LEFT JOIN hrmresource e ON e.id = t1.employee_id" +
-                "        LEFT JOIN hrmdepartment d ON d.id = e.department" +
+                "        LEFT JOIN hrmdepartment d ON d.id = e.departmentid" +
                 "        LEFT JOIN hrsa_tax_agent t2 ON t1.tax_agent_id = t2.id";
 
         SalaryWeaTable<AddUpSituationDTO> table = new SalaryWeaTable<AddUpSituationDTO>(user, AddUpSituationDTO.class);

src/com/engine/salary/mapper/datacollection/EmployMapper.xml

@@ -17,7 +17,7 @@
         from hrmresource e
         where e.status not in (7)
         <if test="collection != null and collection.size()>0">
-            AND t.id IN
+            AND e.id IN
             <foreach collection="collection" open="(" item="id" separator="," close=")">
                 #{id}
             </foreach>

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

@@ -66,6 +66,16 @@ public class AddUpSituationController {
         return ResponseResult.run(getService(user)::list, map);
     }
 
+    @POST
+    @Path("/getDetailList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getDetailList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AddUpSituationQueryParam queryParam) {
+        User user = HrmUserVarify.getUser(request, response);
+        Map<String, Object> map = ParamUtil.request2Map(request);
+        map.put("queryParam", queryParam);
+        return ResponseResult.run(getService(user)::getDetailList, map);
+    }
+
 
     @GET
     @Path("/downloadTemplate")
@@ -250,4 +260,6 @@ public class AddUpSituationController {
         return ResponseResult.run(getService(user)::importAddUpSituation, map);
     }
 
+
+
 }