diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java index cdce8eb..588dd7f 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/SubStatisticsController.java @@ -79,7 +79,6 @@ public class SubStatisticsController extends BaseController { @SysLog(title = "分包工程信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->分包工程信息", details = "分包工程信息") public TableDataInfo getSubProMsg(HomePagePo homePagePo) { try { - startPage(); List list = subStatisticsService.getSubProMsg(homePagePo); return getDataTable(list); } catch (Exception e) { @@ -98,7 +97,6 @@ public class SubStatisticsController extends BaseController { @SysLog(title = "班组信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->班组信息", details = "班组信息") public TableDataInfo getSubTeamMsg(HomePagePo homePagePo) { try { - startPage(); List list = subStatisticsService.getSubTeamMsg(homePagePo); return getDataTable(list); } catch (Exception e) { @@ -117,7 +115,6 @@ public class SubStatisticsController extends BaseController { @SysLog(title = "考勤机信息", businessType = OperaType.QUERY, logType = 0, module = "分包统计->考勤机信息", details = "考勤机信息") public TableDataInfo getSubDeviceMsg(HomePagePo homePagePo) { try { - startPage(); List list = subStatisticsService.getSubDeviceMsg(homePagePo); return getDataTable(list); } catch (Exception e) { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java index bb2724d..2db8d4a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java @@ -117,4 +117,9 @@ public class PmSubTeamContract { * 项目部id */ private Integer orgId; + + /** + * 是否上海项目 1 是 0 不是 + */ + private Integer isShanghai; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmSubContractVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmSubContractVo.java index 0f7c453..7532956 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmSubContractVo.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/BmSubContractVo.java @@ -104,4 +104,10 @@ public class BmSubContractVo { */ List contractFile; + + /** + * 是否上海项目 1 是 0 不是 + */ + private Integer isShanghai; + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java index 468c880..ee24fed 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/SubStatisticsServiceImpl.java @@ -70,10 +70,15 @@ public class SubStatisticsServiceImpl implements SubStatisticsService { //累计入场 ProStatisticsPo einNum = subStatisticsMapper.getEinNumByHis(homePagePo); if(einNum != null){ + //累计入场 map.put("einNumHis",einNum.getEinNumHis()); - map.put("exitNum",einNum.getEinNumHis() - Long.parseLong((String) map.get("einNum")) ); + //出场 + map.put("exitNum",einNum.getEinNumHis() - Long.parseLong(String.valueOf(map.get("einNum")))); + //入场时间 map.put("einTime",einNum.getEinTime()); + //出场时间 map.put("exitTime",einNum.getExitTime()); + map.put("exitUploadFile",einNum.getExitUploadFile()); map.put("noExitUploadFile",einNum.getNoExitUploadFile()); }else{ @@ -87,8 +92,11 @@ public class SubStatisticsServiceImpl implements SubStatisticsService { //在场灯状态 ProStatisticsPo lightStatus = subStatisticsMapper.getEinWorkerLight(homePagePo); if(lightStatus != null){ + //黄灯数量 map.put("yellowNum",lightStatus.getYellowNum()); + //绿灯数量 map.put("greenNum",lightStatus.getGreenNum()); + //黄灯7天人数 map.put("yellowThanSevenDayNum",lightStatus.getYellowThanSevenDayNum()); }else{ map.put("yellowNum",0); @@ -98,6 +106,7 @@ public class SubStatisticsServiceImpl implements SubStatisticsService { //考勤 ProStatisticsPo attAndRepair = subStatisticsMapper.getWorkerAttAndRepair(homePagePo); if(attAndRepair != null){ + //累计考勤天数 map.put("attNumHis",attAndRepair.getAttNumHis()); map.put("repairPersonNum",attAndRepair.getRepairPersonNum()); map.put("repairNumHis",attAndRepair.getRepairNumHis()); @@ -112,6 +121,7 @@ public class SubStatisticsServiceImpl implements SubStatisticsService { //工资 ProStatisticsPo workerWage = subStatisticsMapper.getWorkerWage(homePagePo); if(workerWage != null){ + //累计发放工资 map.put("salaryMoneyNum",workerWage.getSalaryMoneyNum()); map.put("payrollNum",workerWage.getPayrollNum()); map.put("payrollWorkerTime",workerWage.getPayrollWorkerTime()); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml index b008823..78a83f0 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml @@ -39,7 +39,8 @@ pp.pro_name as proName, bsc.sub_ein_time as subEinTime, bsc.sub_exit_time as subExitTime, - bsc.sub_ein_status as subEinStatus + bsc.sub_ein_status as subEinStatus, + pp.is_shanghai as isShanghai from bm_sub_contract bsc left join pm_sub ps on bsc.sub_id = ps.id left join pm_project pp on bsc.pro_id = pp.id @@ -102,7 +103,8 @@ pp.pro_name as proName, bsc.sub_ein_time as subEinTime, bsc.sub_exit_time as subExitTime, - bsc.sub_ein_status as subEinStatus + bsc.sub_ein_status as subEinStatus, + pp.is_shanghai as isShanghai from bm_sub_contract bsc left join pm_sub ps on bsc.sub_id = ps.id left join pm_project pp on bsc.pro_id = pp.id diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml index 1ef528d..c89df3d 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml @@ -14,7 +14,15 @@ #{createTime}, #{updateTime},#{subId},#{teamId}) - update pm_att_device set pro_id = #{proId},update_time = #{updateTime},update_user = #{updateUser} + update pm_att_device + + pro_id = #{proId}, + update_time = #{updateTime}, + update_user = #{updateUser}, + + serial_number = #{serialNumber}, + + where is_active = '1' and device_code = #{deviceCode} diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml index 2846ca8..08a119c 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml @@ -28,7 +28,7 @@ select - ps.id as subId, + ps.id , ps.sub_name as subName, - ps.legal_person as + ps.legal_person, count(DISTINCT bsc.pro_id) as proNum, count(DISTINCT pstc.id) as teamNum, count(DISTINCT bwem.worker_id) as einNum @@ -18,6 +18,9 @@ and ps.sub_name like concat('%', #{subName}, '%') + + and ps.id =#{subId} + GROUP BY ps.id @@ -87,7 +90,7 @@ bsc.sub_contract_code, bsc.sub_contract_name, bsc.sub_ein_status, - count(bwem.worker_id) as einNum, + count(DISTINCT bwem.worker_id) as einNum, count(DISTINCT bwer.worker_id) as einNumHis, bsc.sub_ein_time, bsc.sub_exit_time, @@ -117,7 +120,8 @@ pstc.id as teamId, ps.sub_name, count(DISTINCT bwem.worker_id) as einNum, - count(DISTINCT bwer.worker_id) as einNumHis + count(DISTINCT bwer.worker_id) as einNumHis, + pp.pro_name FROM pm_sub ps INNER JOIN bm_sub_contract bsc ON ps.id = bsc.sub_id