Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/shinestar/modules/base/dao/CanteenDiningRecordDAO.java

@@ -32,5 +32,4 @@ public interface CanteenDiningRecordDAO {
 
 	List<Map> canteenHqPersonList(Map<String,Object> searchParams,List<Sort> sortList);
 
-
 }

common/src/main/java/com/jpsoft/shinestar/modules/base/dao/PersonInfoDAO.java

@@ -71,5 +71,7 @@ public interface PersonInfoDAO {
 
 	PersonInfo findJobNumber(String jobNumber);
 
+	List<PersonInfo> findByHq();
+
 	int updateNullForHqSortNo(Long personId);
 }

common/src/main/java/com/jpsoft/shinestar/modules/base/service/PersonInfoService.java

@@ -77,5 +77,7 @@ public interface PersonInfoService {
 
 	PersonInfo findJobNumber(String jobNumber);
 
+	List<PersonInfo> findByHq();
+
 	int updateNullForHqSortNo(Long personId);
 }

common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/PersonInfoServiceImpl.java

@@ -525,4 +525,9 @@ public class PersonInfoServiceImpl implements PersonInfoService {
         return personInfoDAO.updateNullForHqSortNo(personId);
     }
 
+    @Override
+    public List<PersonInfo> findByHq(){
+        return personInfoDAO.findByHq();
+    }
+
 }

common/src/main/resources/mapper/base/CanteenDiningRecord.xml

@@ -115,6 +115,7 @@
 	<select id="findByPersonId" resultMap="CanteenDiningRecordMap">
 		select * from base_canteen_dining_record where del_flag=false and person_id = #{0}
 	</select>
+
 	<select id="findCountByPersonIdAndAddress" resultType="int">
 		select count(*) from base_canteen_dining_record
 		<where>

common/src/main/resources/mapper/base/PersonInfo.xml

@@ -769,6 +769,8 @@
     <select id="findJobNumber" resultMap="PersonInfoMap">
         select * from base_person_info where del_flag=false and job_number = #{0} limit 1
     </select>
-
+    <select id="findByHq" resultMap="PersonInfoMap">
+        select * from base_person_info where del_flag=false and hq_status='1' or hq_status='2'
+    </select>
 
 </mapper>

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/BusinessOutController.java

@@ -179,6 +179,18 @@ public class BusinessOutController {
 
                 rabbitTemplate.convertAndSend("updatePersonAttendanceQueue", updatePersonAttendanceDTO);
 
+
+                Long personId = businessOut.getPersonId();
+
+                PersonInfo personInfo = personInfoService.get(personId);
+
+                if(personInfo!=null){
+                    personInfo.setWorkStatus("1");
+                    personInfo.setUpdateBy(subject);
+                    personInfo.setUpdateTime(new Date());
+                    personInfoService.update(personInfo);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(affectCount);
             } else {

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/CanteenDiningRecordController.java

@@ -71,6 +71,7 @@ public class CanteenDiningRecordController {
     @Autowired
     private UserCompanyService userCompanyService;
 
+
     @Autowired
     private PersonDeviceLogService personDeviceLogService;
 
@@ -260,7 +261,7 @@ public class CanteenDiningRecordController {
             Map<String, Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.record_time", "desc"));
+            sortList.add(new Sort("a.create_time", "desc"));
 
             if (personId != null) {
                 searchParams.put("personId", personId);
@@ -349,10 +350,7 @@ public class CanteenDiningRecordController {
                     }
                 }
 
-                if(canteenDiningRecord.getRecordTime()!=null) {
-                    map.put("recordTime", sdf.format(canteenDiningRecord.getRecordTime()));
-                }
-
+                map.put("createTime",sdf.format(canteenDiningRecord.getCreateTime()));
                 map.put("categoryAmount",canteenDiningRecord.getCategoryAmount());
                 map.put("address",canteenDiningRecord.getAddress());
                 map.put("personName",personName);
@@ -1031,7 +1029,7 @@ public class CanteenDiningRecordController {
 
         return messageResult;
     }
-    
+
     @GetMapping("batchUpdate")
     @ApiOperation(value="更新食堂就餐记录")
     public MessageResult<Integer> batchUpdate(Long personId,String deviceNo,
@@ -1083,11 +1081,12 @@ public class CanteenDiningRecordController {
         }
         catch (Exception ex){
             logger.error(ex.getMessage(),ex);
-    
+
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
         }
-    
+
         return messageResult;
+
     }
 }

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/CanteenOutsourcerBalanceController.java

@@ -429,7 +429,7 @@ public class CanteenOutsourcerBalanceController {
                     }
                 }
 
-                map.put("createTime",sdf.format(canteenDiningRecord.getCreateTime()));
+                map.put("recordTime",sdf.format(canteenDiningRecord.getRecordTime()));
                 map.put("categoryAmount",canteenDiningRecord.getCategoryAmount());
                 map.put("address",canteenDiningRecord.getAddress());
                 map.put("personName",personName);

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/RequestForLeaveInfoController.java

@@ -1080,6 +1080,17 @@ public class RequestForLeaveInfoController {
 
                 rabbitTemplate.convertAndSend("updatePersonAttendanceQueue", updatePersonAttendanceDTO);
 
+                Long personId = requestForLeaveInfo.getPersonId();
+
+                PersonInfo personInfo = personInfoService.get(personId);
+
+                if(personInfo!=null){
+                    personInfo.setWorkStatus("1");
+                    personInfo.setUpdateBy(subject);
+                    personInfo.setUpdateTime(new Date());
+                    personInfoService.update(personInfo);
+                }
+
                 msgResult.setResult(true);
                 msgResult.setData(affectCount);
             } else {

web/src/main/java/com/jpsoft/shinestar/modules/workflow/ProcessActivityController.java

@@ -395,6 +395,10 @@ public class ProcessActivityController {
             pageDto.add(dto);
         }
 
+        pageDto.setPageSize(page.getPageSize());
+        pageDto.setTotal(page.getTotal());
+        pageDto.setPageNum(page.getPageNum());
+
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(pageDto));
 

web/src/main/java/com/jpsoft/shinestar/mq/listener/RequestForLeaveListener.java

@@ -40,7 +40,7 @@ public class RequestForLeaveListener {
             PersonPopedom personPopedom = personPopedomService.get(requestForLeaveInfo.getPersonPopedomId());
             PersonInfo personInfo = personInfoService.get(personPopedom.getPersonId());
             if (requestForLeaveInfo != null) {
-                String startTimeStr = DateUtil.format(requestForLeaveInfo.getStartTime(), "yyyy-MM-dd");
+                /*String startTimeStr = DateUtil.format(requestForLeaveInfo.getStartTime(), "yyyy-MM-dd");
                 String endTimeStr = DateUtil.format(requestForLeaveInfo.getEndTime(), "yyyy-MM-dd");
                 if ("0".equals(requestForLeaveInfo.getStartTimeQuantum())) {
                     startTimeStr = startTimeStr + " " + "06:00:00";
@@ -53,10 +53,14 @@ public class RequestForLeaveListener {
                 }
                 if ("1".equals(requestForLeaveInfo.getEndTimeQuantum())) {
                     endTimeStr = endTimeStr + " " + "18:00:00";
-                }
+                }*/
+
+               /* Date start = DateUtil.parse(startTimeStr);
+                Date end = DateUtil.parse(endTimeStr);*/
+
+               Date start = requestForLeaveInfo.getStartTime();
 
-                Date start = DateUtil.parse(startTimeStr);
-                Date end = DateUtil.parse(endTimeStr);
+               Date end = requestForLeaveInfo.getEndTime();
 
                 if (start.compareTo(new Date()) <= 0 && end.compareTo(new Date()) > 0) {
                     personInfo.setWorkStatus("4");