databank102 4 лет назад
Родитель
Сommit
ab4e9d6ef5

+ 8 - 0
src/main/java/com/lemon/lifecenter/controller/StaffGovManagerController.java

@@ -292,6 +292,7 @@ public class StaffGovManagerController extends LifeCenterController {
               @RequestParam(value="page", required=false, defaultValue="1") int page,
               
               HttpServletRequest request,HttpServletResponse response) {
+          String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
           
           List<LocationDTO> locationCodeList = centerService.selectLocation();
           
@@ -299,6 +300,13 @@ public class StaffGovManagerController extends LifeCenterController {
           dto.setLimitMax( config.pageDataSize );
           dto.setGubun(inputgubun);
           
+          if (inputRegistDay.isEmpty()) {
+              inputRegistDay = LifeCenterFunction.getNow("yyyy-MM-dd");
+          }
+          
+          dto.setRegistDay(inputRegistDay);
+          dto.setCenterCode(Integer.valueOf(sesCenterCode));
+          
           int total = service.selectStaffManagerCount(dto);
           List<StaffManagerDTO> list = new ArrayList<StaffManagerDTO>();
           if (total > 0) {

+ 8 - 0
src/main/java/com/lemon/lifecenter/controller/StaffMediManagerController.java

@@ -292,6 +292,7 @@ public class StaffMediManagerController extends LifeCenterController {
               @RequestParam(value="page", required=false, defaultValue="1") int page,
               
               HttpServletRequest request,HttpServletResponse response) {
+          String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
           
           List<LocationDTO> locationCodeList = centerService.selectLocation();
           
@@ -299,6 +300,13 @@ public class StaffMediManagerController extends LifeCenterController {
           dto.setLimitMax( config.pageDataSize );
           dto.setGubun(inputgubun);
           
+          if (inputRegistDay.isEmpty()) {
+              inputRegistDay = LifeCenterFunction.getNow("yyyy-MM-dd");
+          }
+          
+          dto.setRegistDay(inputRegistDay);
+          dto.setCenterCode(Integer.valueOf(sesCenterCode));
+          
           int total = service.selectStaffManagerCount(dto);
           List<StaffManagerDTO> list = new ArrayList<StaffManagerDTO>();
           if (total > 0) {

+ 5 - 4
src/main/resources/mybatis/mapper/staff/staffManager.xml

@@ -5,23 +5,24 @@
     <select id="selectStaffManagerCount" parameterType="StaffManagerDTO" resultType="int">
         <![CDATA[
             SELECT COUNT(*) AS TOTAL
-              FROM STAFF_MANAGER SM
+              FROM STAFF_MANAGER SM, CENTER_INFO CI
             WHERE 1 = 1
+                AND SM.CENTER_CODE = CI.CENTER_CODE
                 AND GUBUN = #{gubun}
         ]]>
         <if test='centerCode != null and centerCode != ""'>
             <![CDATA[
-                AND CENTER_CODE = #{centerCode}
+                AND SM.CENTER_CODE = #{centerCode}
             ]]>
         </if>
         <if test='centerName != null and centerName != ""'>
             <![CDATA[
-                AND CENTER_NAME LIKE CONCAT('%', #{centerName}, '%')
+                AND CI.CENTER_NAME LIKE CONCAT('%', #{centerName}, '%')
             ]]>
         </if>
         <if test='locationCode != null and locationCode != ""'>
             <![CDATA[
-                AND LOCATION_CODE = #{locationCode}
+                AND CI.LOCATION_CODE = #{locationCode}
             ]]>
         </if>
         <if test='registDay != null and registDay != ""'>

+ 3 - 3
src/main/webapp/WEB-INF/jsp/staff/manager/daylist.jsp

@@ -180,9 +180,9 @@ $(function() {
                                             <c:choose>     
                                                 <c:when test="${gubun eq 'M'}">
                                                 <col style=" width: 4%; ">
-                                                <col style=" width: 8%; ">
-                                                <col style=" width: 5%; ">
-                                                <col style=" width: 8%; ">
+                                                <col style=" width: 6%; ">
+                                                <col style=" width: 4%; ">
+                                                <col style=" width: 4%; ">
                                                 <col style=" width: 4%; ">
                                                 <col style=" width: 4%; ">
                                                 <col style=" width: 4%; ">