11

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/entity/bdClockinMonth.java

@@ -39,6 +39,8 @@ public class bdClockinMonth {
 	@Excel(name = "工号", width = 15)
 	private String username;//人员档案中工号
 
+	private String epibolyType;//外包类型（数据字典）
+
 	@TableField(exist = false)
 	private String userId;//人员档案中id
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/mapper/xml/bdClockinMonthMapper.xml

@@ -64,6 +64,7 @@
             a.entry_date, -- 入职日期
             a.id personId,a.username person_code,a.realname person_name,
             a.category, -- 人员类别 101正式工 102 合同工 103 实习生 104 劳务工
+            a.epiboly_type, -- 外包类型（数据字典）
             a.is_attendance,-- 是否考勤(0是 ，1否)
             a.is_salary, -- 是否算薪
             a.wages_one base_pay, -- 基本工资

jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/service/impl/bdClockinMonthServiceImpl.java

@@ -129,14 +129,21 @@ public class bdClockinMonthServiceImpl extends ServiceImpl<bdClockinMonthMapper,
                 }
 
             }
-            BigDecimal b = new BigDecimal("21.75").subtract(new BigDecimal(String.valueOf(allNum)));
+
+            BigDecimal days = new BigDecimal("21.75");
+            String cate = o.getCategory();
+            if(!StringUtil.isNullOrEmpty(cate) && cate.equals("106")){ //外包6+1 默认考勤天数未26天，其他为21.75
+                days = new BigDecimal("26");
+            }
+
+            BigDecimal b = days.subtract(new BigDecimal(String.valueOf(allNum)));
             o.setWorkDayReal(b.toString());
             String[] date = nowDate.split("-");
             o.setMonthTime(nowDate);
             o.setYears(date[0]);
             o.setMonths(date[1]);
 
-            o.setWorkDay("21.75");
+            o.setWorkDay(days.toString());
             o.setId(UUIDGenerator.generate());
             clockinMonthMapper.insert(o);