三个统计导出

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTableRosterVo.java

@@ -126,7 +126,7 @@ public class ProMonthTableRosterVo {
     /**
      *在岗情况
      */
-    @Excel(name = "在岗情况",sort = 13)
+    @Excel(name = "在岗情况",sort = 13,readConverterExp = "0=离岗,1=在岗")
     private String onDuty;
 
     /**

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmAttDeviceMapper.java

@@ -14,6 +14,9 @@ public interface PmAttDeviceMapper {
 
     int updatePmAttDevice(PmAttDevice pmAttDevice);
 
+    /**
+     * 删除考勤机
+     */
     int delPmAttDevice(PmAttDevice pmAttDevice);
 
     void addPmAttDeviceHis(PmAttDevice pmAttDeviceOld);

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmAttDeviceService.java

@@ -6,11 +6,24 @@ import com.bonus.bmw.domain.vo.PmAttDeviceVo;
 import java.util.List;
 
 public interface PmAttDeviceService {
+
+    /**
+     * 考勤机列表
+     */
     List<PmAttDeviceVo> selectPmAttDeviceList(PmAttDevice pmAttDevice);
 
+    /**
+     * 新增考勤机
+     */
     int addPmAttDevice(PmAttDevice pmAttDevice) throws Exception;
 
+    /**
+     * 解绑
+     */
     int updatePmAttDevice(PmAttDevice pmAttDevice) throws Exception;
 
+    /**
+     * 删除考勤机
+     */
     int delPmAttDevice(PmAttDevice pmAttDevice) throws Exception;
 }

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java

@@ -35,6 +35,9 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
     @Resource
     private RedisService redisService;
 
+    /**
+     * 考勤机列表
+     */
     @Override
     public List<PmAttDeviceVo> selectPmAttDeviceList(PmAttDevice pmAttDevice) {
         List<PmAttDeviceVo> pmAttDeviceVoList =  pmAttDeviceMapper.selectPmAttDeviceList(pmAttDevice);
@@ -48,6 +51,9 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
         return pmAttDeviceVoList;
     }
 
+    /**
+     * 新增考勤机
+     */
     @Override
     @Transactional
     public int addPmAttDevice(PmAttDevice pmAttDevice) throws Exception {
@@ -77,6 +83,9 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
         return pmAttDeviceMapper.addPmAttDevice(pmAttDevice);
     }
 
+    /**
+     * 解绑
+     */
     @Override
     @Transactional
     public int updatePmAttDevice(PmAttDevice pmAttDevice) throws Exception {
@@ -111,6 +120,9 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
         return pmAttDeviceMapper.updatePmAttDevice(pmAttDevice);
     }
 
+    /**
+     * 删除考勤机
+     */
     @Override
     public int delPmAttDevice(PmAttDevice pmAttDevice) throws Exception {
         return pmAttDeviceMapper.delPmAttDevice(pmAttDevice);

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml

@@ -19,6 +19,8 @@
                 pro_id = #{proId},
                 update_time = #{updateTime},
                 update_user = #{updateUser},
+            sub_id = #{subId},
+            team_id = #{teamId},
             <if test="serialNumber != null and serialNumber != ''">
                 serial_number = #{serialNumber},
             </if>