@@ -123,7 +87,7 @@ export default {
computed: {
...mapGetters(["dept"]),
},
- mounted() {},
+ mounted() { },
methods: {
doOk() {
diff --git a/ruoyi-ui/src/views/project/unitpay/dayPay.vue b/ruoyi-ui/src/views/project/unitpay/dayPay.vue
new file mode 100644
index 00000000..409cd7aa
--- /dev/null
+++ b/ruoyi-ui/src/views/project/unitpay/dayPay.vue
@@ -0,0 +1,157 @@
+
+
+
+ 璇烽夋嫨鏃ユ湡:
+
+
+ 鎼滅储
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ row.workerGender == 1 ? "濂" : "鐢"
+ }}
+
+
+
+
+
+
+ {{(row.pay/100.0).toFixed(2)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/project/unitpay/index.vue b/ruoyi-ui/src/views/project/unitpay/index.vue
new file mode 100644
index 00000000..682789dd
--- /dev/null
+++ b/ruoyi-ui/src/views/project/unitpay/index.vue
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ 鎼滅储
+ 瀵煎嚭
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ row.workerGender == 1 ? "濂" : "鐢"
+ }}
+
+
+
+
+
+
+ {{row.days }}
+
+
+
+ {{(row.attendanceTime||row.attendanceOutTime)|formatDate }}
+
+
+
+
+ {{(row.pay/100.0).toFixed(2)}}
+
+ {{(row.unitPay/100.0).toFixed(2)}}*{{row.days}}={{(row.pay/100.0).toFixed(2)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/project/unitpay/monthPay.vue b/ruoyi-ui/src/views/project/unitpay/monthPay.vue
new file mode 100644
index 00000000..9f073582
--- /dev/null
+++ b/ruoyi-ui/src/views/project/unitpay/monthPay.vue
@@ -0,0 +1,164 @@
+
+
+
+ 璇烽夋嫨鏈堜唤:
+
+
+ 鎼滅储
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ row.workerGender == 1 ? "濂" : "鐢"
+ }}
+
+
+
+
+
+
+
+ {{(row.pay/100.0).toFixed(2)}}
+
+ {{(row.unitPay/100.0).toFixed(2)}}*{{row.days}}={{(row.pay/100.0).toFixed(2)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/project/unitpay/paySetting.vue b/ruoyi-ui/src/views/project/unitpay/paySetting.vue
new file mode 100644
index 00000000..7780d5e4
--- /dev/null
+++ b/ruoyi-ui/src/views/project/unitpay/paySetting.vue
@@ -0,0 +1,92 @@
+
+
+
+ 淇濆瓨
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/project/unitpay/unitpayDrawer.vue b/ruoyi-ui/src/views/project/unitpay/unitpayDrawer.vue
new file mode 100644
index 00000000..1c757ecf
--- /dev/null
+++ b/ruoyi-ui/src/views/project/unitpay/unitpayDrawer.vue
@@ -0,0 +1,90 @@
+
+
+
+
+ {{ title + " 銆愬姵鍔″疄鍚嶇鐞嗐" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java
new file mode 100644
index 00000000..eacd1f06
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceUnitpayController.java
@@ -0,0 +1,326 @@
+package com.yanzhu.jh.project.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+import com.yanzhu.jh.project.domain.vo.ExportAttendancDay;
+import com.yanzhu.jh.project.domain.vo.ExportAttendancMonth;
+import com.yanzhu.jh.project.service.ISurProjectAttendanceDataService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay;
+import com.yanzhu.jh.project.service.ISurProjectAttendanceUnitpayService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 鍔宠祫绠＄悊Controller
+ *
+ * @author ruoyi
+ * @date 2024-11-10
+ */
+@RestController
+@RequestMapping("/project/unitpay")
+public class SurProjectAttendanceUnitpayController extends BaseController
+{
+ @Autowired
+ private ISurProjectAttendanceUnitpayService surProjectAttendanceUnitpayService;
+ @Autowired
+ private ISurProjectAttendanceDataService surProjectAttendanceDataService;
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:list')")
+ @GetMapping("/list")
+ public AjaxResult list(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay)
+ {
+ List
list = surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(surProjectAttendanceUnitpay);
+ List iniList=surProjectAttendanceUnitpayService.initList(surProjectAttendanceUnitpay);
+ for(SurProjectAttendanceUnitpay it :iniList){
+ List tmpList= list.stream().filter(item->StrUtil.equals(it.getWorkTypeName(),item.getWorkTypeName()) && StrUtil.equals(it.getGroupName(),item.getGroupName())).collect(Collectors.toList());
+ if(tmpList.isEmpty()){
+ it.setUnitPay(0l);
+ list.add(it);
+ }
+ }
+ return success(list);
+ }
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:list')")
+ @GetMapping("/listByDay")
+ public TableDataInfo listByDay(SurProjectAttendanceData attWhere)
+ {
+ attWhere.setAttendanceOutTime(attWhere.getAttendanceOutTime());
+ startPage();
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByDate(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ for(SurProjectAttendanceData it :list){
+ it.setDays(1l);
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ }
+
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ涓や釜鏃ユ湡涔嬮棿鏌愪汉鐨勫伐璧
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:list')")
+ @GetMapping("/listByBetweenDay")
+ public TableDataInfo listByBetweenDay(SurProjectAttendanceData attWhere)
+ {
+ attWhere.setAttendanceOutTime(attWhere.getAttendanceOutTime());
+ startPage();
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ for(SurProjectAttendanceData it :list){
+ it.setDays(1l);
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ }
+
+ return getDataTable(list);
+ }
+
+ /**
+ * 鎸変袱涓棩鏈熶箣闂寸殑鏃堕棿宸垎缁勭粺璁″伐璧
+ * @param attWhere
+ * @return
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:list')")
+ @GetMapping("/listGroupBetweenDay")
+ public TableDataInfo listGroupBetweenDay(SurProjectAttendanceData attWhere)
+ {
+ startPage();
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ for(SurProjectAttendanceData it :list){
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ }
+
+ return getDataTable(list);
+ }
+
+
+
+ @PreAuthorize("@ss.hasPermi('project:unitpay:list')")
+ @GetMapping("/listByMonth")
+ public TableDataInfo listByMonth(SurProjectAttendanceData attWhere)
+ {
+ Date dt=DateUtil.parse(attWhere.getAttendanceTime());
+ attWhere.setAttendanceTime( DateUtil.formatDate(DateUtil.beginOfMonth(dt)) );
+ attWhere.setAttendanceOutTime( DateUtil.formatDate(DateUtil.endOfMonth(dt)));
+ startPage();
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ for(SurProjectAttendanceData it :list){
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ }
+
+ return getDataTable(list);
+ }
+
+ /**
+ * 鎸夋棩瀵煎嚭宸ヨ祫
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:export')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportDay")
+ public void exportDay(HttpServletResponse response, SurProjectAttendanceData attWhere)
+ {
+ Date dt=DateUtil.parse(attWhere.getAttendanceTime());
+ attWhere.setAttendanceOutTime(attWhere.getAttendanceTime());
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByDate(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ List exportList=new ArrayList();
+ for(SurProjectAttendanceData it :list){
+ it.setDays(1l);
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ exportList.add(ExportAttendancDay.NEW(it));
+ }
+
+ ExcelUtil util = new ExcelUtil(ExportAttendancDay.class);
+ util.exportExcel(response, exportList, "鍔冲姟宸ヨ祫-鏃ュ伐璧"+DateUtil.format(dt,"YYYY骞碝M鏈圖D鏈"));
+ }
+
+ /**
+ * 鎸夋湀瀵煎嚭宸ヨ祫
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:export')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportMonth")
+ public void exportMonth(HttpServletResponse response, SurProjectAttendanceData attWhere)
+ {
+ Date dt=DateUtil.parse(attWhere.getAttendanceTime());
+ attWhere.setAttendanceTime( DateUtil.formatDate(DateUtil.beginOfMonth(dt)) );
+ attWhere.setAttendanceOutTime( DateUtil.formatDate(DateUtil.endOfMonth(dt)));
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ List exportList=new ArrayList<>();
+ for(SurProjectAttendanceData it :list){
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ exportList.add(ExportAttendancMonth.NEW(it));
+ }
+ ExcelUtil util = new ExcelUtil(ExportAttendancMonth.class);
+ util.exportExcel(response, exportList, "鍔冲姟宸ヨ祫-鏈堝伐璧"+DateUtil.format(dt,"YYYY骞碝M鏈"));
+ }
+
+ /**
+ * 瀵煎嚭涓や釜鏃ユ湡涔嬮棿鐨勬瘡涓憳宸ョ粺璁¤冨嫟
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:export')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportGroupBetweenDay")
+ public void exportGroupBetweenDay(HttpServletResponse response, SurProjectAttendanceData attWhere)
+ {
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataListByMonth(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ List exportList=new ArrayList<>();
+ for(SurProjectAttendanceData it :list){
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ exportList.add(ExportAttendancMonth.NEW(it));
+ }
+ ExcelUtil util = new ExcelUtil(ExportAttendancMonth.class);
+ util.exportExcel(response, exportList, "鍔冲姟宸ヨ祫-宸ヨ祫");
+ }
+ /**
+ * 瀵煎嚭涓や釜鏃ユ湡涔嬮棿鐨勬煇浜哄伐璧
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:export')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportBetweenDay")
+ public void exportBetWeenDay(HttpServletResponse response, SurProjectAttendanceData attWhere)
+ {
+ Date dt=DateUtil.parse(attWhere.getAttendanceTime());
+
+ String tmp=attWhere.getAttendanceTime();
+ if(StrUtil.isNotEmpty(tmp)){
+ int year= DateUtil.parse(tmp).year();
+ attWhere.setYear(year);
+ }
+ List list = surProjectAttendanceDataService.selectSurProjectAttendanceDataList(attWhere);
+ SurProjectAttendanceUnitpay payWhere=new SurProjectAttendanceUnitpay();
+ payWhere.setCfgId(attWhere.getCfgid());
+ List payList= surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayList(payWhere);
+ List exportList=new ArrayList();
+ for(SurProjectAttendanceData it :list){
+ it.setDays(1l);
+ it.setPay(surProjectAttendanceUnitpayService.getPay(payList,it));
+ exportList.add(ExportAttendancDay.NEW(it));
+ }
+
+ ExcelUtil util = new ExcelUtil(ExportAttendancDay.class);
+ util.exportExcel(response, exportList, "鍔冲姟宸ヨ祫-宸ヨ祫");
+ }
+ /**
+ * 鑾峰彇鍔宠祫绠＄悊璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:query')")
+ @GetMapping(value = "/one/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(surProjectAttendanceUnitpayService.selectSurProjectAttendanceUnitpayById(id));
+ }
+
+ /**
+ * 鏂板鍔宠祫绠＄悊
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:add')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody List datas)
+ {
+ return toAjax(surProjectAttendanceUnitpayService.addSurProjectAttendanceUnitpaies(datas));
+ }
+
+ /**
+ * 淇敼鍔宠祫绠＄悊
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:edit')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody SurProjectAttendanceUnitpay surProjectAttendanceUnitpay)
+ {
+ return toAjax(surProjectAttendanceUnitpayService.updateSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay));
+ }
+
+ /**
+ * 鍒犻櫎鍔宠祫绠＄悊
+ */
+ @PreAuthorize("@ss.hasPermi('project:unitpay:remove')")
+ @Log(title = "鍔宠祫绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(surProjectAttendanceUnitpayService.deleteSurProjectAttendanceUnitpayByIds(ids));
+ }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java
index ef0789d5..34f2a7ed 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java
@@ -145,6 +145,42 @@ public class SurProjectAttendanceData extends BaseEntity
}
+ /**
+ * 澶╂暟
+ */
+ private long days;
+
+ public long getDays() {
+ return days;
+ }
+
+ public void setDays(long days) {
+ this.days = days;
+ }
+
+ public long getPay() {
+ return pay;
+ }
+
+ public void setPay(long pay) {
+ this.pay = pay;
+ }
+
+ public Long getUnitPay() {
+ return unitPay;
+ }
+
+ public void setUnitPay(Long unitPay) {
+ this.unitPay = unitPay;
+ }
+
+ private Long unitPay;
+
+ /**
+ * 宸ヨ祫
+ */
+ private long pay;
+
private Long projectId;
@Excel(name = "椤圭洰鍚嶇О")
private String projectName;
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java
new file mode 100644
index 00000000..00b52da3
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUnitpay.java
@@ -0,0 +1,150 @@
+package com.yanzhu.jh.project.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鍔宠祫绠＄悊瀵硅薄 sur_project_attendance_unitpay
+ *
+ * @author ruoyi
+ * @date 2024-11-10
+ */
+public class SurProjectAttendanceUnitpay extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private Long id;
+
+ /** 閰嶇疆ID */
+ @Excel(name = "閰嶇疆ID")
+ private Long cfgId;
+
+ /** 鐝粍ID */
+ @Excel(name = "鐝粍ID")
+ private String groupId;
+
+ /** 鐝粍鍚嶇О */
+ @Excel(name = "鐝粍鍚嶇О")
+ private String groupName;
+
+ /** 宸ョ缂栫爜 */
+ @Excel(name = "宸ョ缂栫爜")
+ private String workTypeCode;
+
+ /** 宸ョ */
+ @Excel(name = "宸ョ")
+ private String workTypeName;
+
+ /** 宸ヨ祫 */
+ @Excel(name = "宸ヨ祫")
+ private Long unitPay;
+
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private Long isDel;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setCfgId(Long cfgId)
+ {
+ this.cfgId = cfgId;
+ }
+
+ public Long getCfgId()
+ {
+ return cfgId;
+ }
+ public void setGroupId(String groupId)
+ {
+ this.groupId = groupId;
+ }
+
+ public String getGroupId()
+ {
+ return groupId;
+ }
+ public void setGroupName(String groupName)
+ {
+ this.groupName = groupName;
+ }
+
+ public String getGroupName()
+ {
+ return groupName;
+ }
+ public void setWorkTypeCode(String workTypeCode)
+ {
+ this.workTypeCode = workTypeCode;
+ }
+
+ public String getWorkTypeCode()
+ {
+ return workTypeCode;
+ }
+ public void setWorkTypeName(String workTypeName)
+ {
+ this.workTypeName = workTypeName;
+ }
+
+ public String getWorkTypeName()
+ {
+ return workTypeName;
+ }
+ public void setUnitPay(Long unitPay)
+ {
+ this.unitPay = unitPay;
+ }
+
+ public Long getUnitPay()
+ {
+ return unitPay;
+ }
+ public void setIsDel(Long isDel)
+ {
+ this.isDel = isDel;
+ }
+
+ public Long getIsDel()
+ {
+ return isDel;
+ }
+
+ private int year;
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("cfgId", getCfgId())
+ .append("groupId", getGroupId())
+ .append("groupName", getGroupName())
+ .append("workTypeCode", getWorkTypeCode())
+ .append("workTypeName", getWorkTypeName())
+ .append("unitPay", getUnitPay())
+ .append("remark", getRemark())
+ .append("isDel", getIsDel())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+
+ public int getYear() {
+ return year;
+ }
+
+ public void setYear(int year) {
+ this.year = year;
+ }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancDay.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancDay.java
new file mode 100644
index 00000000..452e6ddc
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancDay.java
@@ -0,0 +1,143 @@
+package com.yanzhu.jh.project.domain.vo;
+
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.common.annotation.Excel;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+
+import java.math.BigDecimal;
+
+/**
+ * 鑰冨嫟瀵煎嚭鏃ユ暟鎹
+ */
+public class ExportAttendancDay {
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptName;
+ @Excel(name = "濮撳悕")
+ private String workerName;
+ @Excel(name = "绫嶈疮")
+ private String nativePlace;
+ @Excel(name = "鎬у埆")
+ private String sex;
+ @Excel(name = "鍒嗗寘鍟嗗悕绉")
+ private String companyName;
+ @Excel(name = "鎵灞炵彮缁")
+ private String groupName;
+ @Excel(name = "宸ョ")
+ private String workTypeName;
+ @Excel(name = "鍑哄嫟鏃ユ湡")
+ private String attendanceDate;
+ @Excel(name = "鏃ュ伐璧")
+ private BigDecimal pay;
+ @Excel(name = "宸ョ鏃ュ伐璧")
+ private BigDecimal unitPay;
+
+ public static ExportAttendancDay NEW(SurProjectAttendanceData it) {
+ ExportAttendancDay d=new ExportAttendancDay();
+ d.projectName = it.getProjectName();
+ d.deptName = it.getDeptName();
+ d.workerName = it.getWorkerName();
+ d.nativePlace = it.getNativePlace();
+ d.sex=it.getWorkerGender().intValue()==0?"鐢":"濂";
+ d.companyName=it.getCompanyName();
+ d.groupName=it.getGroupName();
+ d.workTypeName = it.getWorkTypeName();
+ d.pay=BigDecimal.valueOf(it.getPay()/100.0);
+ if(it.getAttendanceTime()!=null){
+ d.attendanceDate= DateUtil.formatDate(DateUtil.parse(it.getAttendanceTime()));
+ }else if(it.getAttendanceOutTime()!=null){
+ d.attendanceDate= DateUtil.formatDate(DateUtil.parse(it.getAttendanceOutTime()));
+ }
+ d.unitPay=BigDecimal.valueOf(it.getUnitPay()/100.0);
+ return d;
+ }
+
+ public String getAttendanceDate() {
+ return attendanceDate;
+ }
+
+ public void setAttendanceDate(String attendanceDate) {
+ this.attendanceDate = attendanceDate;
+ }
+
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getWorkerName() {
+ return workerName;
+ }
+
+ public void setWorkerName(String workerName) {
+ this.workerName = workerName;
+ }
+
+ public String getNativePlace() {
+ return nativePlace;
+ }
+
+ public void setNativePlace(String nativePlace) {
+ this.nativePlace = nativePlace;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getGroupName() {
+ return groupName;
+ }
+
+ public void setGroupName(String groupName) {
+ this.groupName = groupName;
+ }
+
+ public String getWorkTypeName() {
+ return workTypeName;
+ }
+
+ public void setWorkTypeName(String workTypeName) {
+ this.workTypeName = workTypeName;
+ }
+
+ public BigDecimal getPay() {
+ return pay;
+ }
+
+ public void setPay(BigDecimal pay) {
+ this.pay = pay;
+ }
+
+ public BigDecimal getUnitPay() {
+ return unitPay;
+ }
+
+ public void setUnitPay(BigDecimal unitPay) {
+ this.unitPay = unitPay;
+ }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancMonth.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancMonth.java
new file mode 100644
index 00000000..0ed9a1c3
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/ExportAttendancMonth.java
@@ -0,0 +1,139 @@
+package com.yanzhu.jh.project.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+
+import java.math.BigDecimal;
+
+/**
+ * 鑰冨嫟瀵煎嚭鏈堟暟鎹
+ */
+public class ExportAttendancMonth {
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptName;
+ @Excel(name = "濮撳悕")
+ private String workerName;
+ @Excel(name = "绫嶈疮")
+ private String nativePlace;
+ @Excel(name = "鎬у埆")
+ private String sex;
+ @Excel(name = "鍒嗗寘鍟嗗悕绉")
+ private String companyName;
+ @Excel(name = "鎵灞炵彮缁")
+ private String groupName;
+ @Excel(name = "宸ョ")
+ private String workTypeName;
+ @Excel(name = "鏈堝伐璧")
+ private BigDecimal pay;
+ @Excel(name = "鏈堝嚭鍕ゅぉ鏁")
+ private long days;
+ @Excel(name = "宸ョ鏃ュ伐璧")
+ private BigDecimal unitPay;
+
+ public static ExportAttendancMonth NEW(SurProjectAttendanceData it) {
+ ExportAttendancMonth d=new ExportAttendancMonth();
+ d.projectName = it.getProjectName();
+ d.projectName = it.getProjectName();
+ d.deptName = it.getDeptName();
+ d.workerName = it.getWorkerName();
+ d.nativePlace = it.getNativePlace();
+ d.sex=it.getWorkerGender().intValue()==0?"鐢":"濂";
+ d.companyName=it.getCompanyName();
+ d.groupName=it.getGroupName();
+ d.workTypeName = it.getWorkTypeName();
+ d.pay=BigDecimal.valueOf(it.getPay()/100.0);
+ d.days=it.getDays();
+ d.unitPay=BigDecimal.valueOf(it.getUnitPay()/100.0);
+ return d;
+ }
+
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getWorkerName() {
+ return workerName;
+ }
+
+ public void setWorkerName(String workerName) {
+ this.workerName = workerName;
+ }
+
+ public String getNativePlace() {
+ return nativePlace;
+ }
+
+ public void setNativePlace(String nativePlace) {
+ this.nativePlace = nativePlace;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+
+ public String getGroupName() {
+ return groupName;
+ }
+
+ public void setGroupName(String groupName) {
+ this.groupName = groupName;
+ }
+
+ public String getWorkTypeName() {
+ return workTypeName;
+ }
+
+ public void setWorkTypeName(String workTypeName) {
+ this.workTypeName = workTypeName;
+ }
+
+ public BigDecimal getPay() {
+ return pay;
+ }
+
+ public void setPay(BigDecimal pay) {
+ this.pay = pay;
+ }
+
+ public long getDays() {
+ return days;
+ }
+
+ public void setDays(long days) {
+ this.days = days;
+ }
+
+ public BigDecimal getUnitPay() {
+ return unitPay;
+ }
+
+ public void setUnitPay(BigDecimal unitPay) {
+ this.unitPay = unitPay;
+ }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
index 94aad3cd..18e72e99 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
@@ -132,4 +132,8 @@ public interface SurProjectAttendanceDataMapper
public List attendanceDataList(SurProjectAttendanceData where);
public List groupTodayCompanyTypeId(SurProjectAttendanceData where);
+
+ List selectSurProjectAttendanceDataListByMonth(SurProjectAttendanceData attWhere);
+
+ List selectSurProjectAttendanceDataListByDate(SurProjectAttendanceData attWhere);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java
new file mode 100644
index 00000000..13f53a66
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUnitpayMapper.java
@@ -0,0 +1,63 @@
+package com.yanzhu.jh.project.mapper;
+
+import java.util.List;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay;
+
+/**
+ * 鍔宠祫绠＄悊Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-11-10
+ */
+public interface SurProjectAttendanceUnitpayMapper
+{
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊
+ *
+ * @param id 鍔宠祫绠＄悊涓婚敭
+ * @return 鍔宠祫绠＄悊
+ */
+ public SurProjectAttendanceUnitpay selectSurProjectAttendanceUnitpayById(Long id);
+
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊鍒楄〃
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 鍔宠祫绠＄悊闆嗗悎
+ */
+ public List selectSurProjectAttendanceUnitpayList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ /**
+ * 鏂板鍔宠祫绠＄悊
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ /**
+ * 淇敼鍔宠祫绠＄悊
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ /**
+ * 鍒犻櫎鍔宠祫绠＄悊
+ *
+ * @param id 鍔宠祫绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteSurProjectAttendanceUnitpayById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鍔宠祫绠＄悊
+ *
+ * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteSurProjectAttendanceUnitpayByIds(Long[] ids);
+
+ List initList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
index 7cd7393a..54ba2925 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java
@@ -138,4 +138,8 @@ public interface ISurProjectAttendanceDataService
* @param addList
*/
void addList(List addList);
+
+ List selectSurProjectAttendanceDataListByMonth(SurProjectAttendanceData attWhere);
+
+ List selectSurProjectAttendanceDataListByDate(SurProjectAttendanceData attWhere);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java
new file mode 100644
index 00000000..c1a48705
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUnitpayService.java
@@ -0,0 +1,69 @@
+package com.yanzhu.jh.project.service;
+
+import java.util.List;
+
+import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay;
+
+/**
+ * 鍔宠祫绠＄悊Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-11-10
+ */
+public interface ISurProjectAttendanceUnitpayService
+{
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊
+ *
+ * @param id 鍔宠祫绠＄悊涓婚敭
+ * @return 鍔宠祫绠＄悊
+ */
+ public SurProjectAttendanceUnitpay selectSurProjectAttendanceUnitpayById(Long id);
+
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊鍒楄〃
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 鍔宠祫绠＄悊闆嗗悎
+ */
+ public List selectSurProjectAttendanceUnitpayList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ /**
+ * 鏂板鍔宠祫绠＄悊
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ /**
+ * 淇敼鍔宠祫绠＄悊
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ /**
+ * 鎵归噺鍒犻櫎鍔宠祫绠＄悊
+ *
+ * @param ids 闇瑕佸垹闄ょ殑鍔宠祫绠＄悊涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteSurProjectAttendanceUnitpayByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鍔宠祫绠＄悊淇℃伅
+ *
+ * @param id 鍔宠祫绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteSurProjectAttendanceUnitpayById(Long id);
+
+ Long getPay(List payList, SurProjectAttendanceData it);
+
+ List initList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay);
+
+ int addSurProjectAttendanceUnitpaies(List datas);
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
index f52bd972..18d75c3b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
@@ -517,4 +517,14 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
}
}
+ @Override
+ public List selectSurProjectAttendanceDataListByMonth(SurProjectAttendanceData attWhere) {
+ return surProjectAttendanceDataMapper.selectSurProjectAttendanceDataListByMonth(attWhere);
+ }
+
+ @Override
+ public List selectSurProjectAttendanceDataListByDate(SurProjectAttendanceData attWhere) {
+ return surProjectAttendanceDataMapper.selectSurProjectAttendanceDataListByDate(attWhere);
+ }
+
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java
new file mode 100644
index 00000000..783bc90c
--- /dev/null
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUnitpayServiceImpl.java
@@ -0,0 +1,150 @@
+package com.yanzhu.jh.project.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+import com.yanzhu.jh.project.mapper.SurProjectAttendanceDataMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.jh.project.mapper.SurProjectAttendanceUnitpayMapper;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceUnitpay;
+import com.yanzhu.jh.project.service.ISurProjectAttendanceUnitpayService;
+import com.ruoyi.common.utils.SecurityUtils;
+/**
+ * 鍔宠祫绠＄悊Service涓氬姟灞傚鐞
+ *
+ * @author ruoyi
+ * @date 2024-11-10
+ */
+@Service
+public class SurProjectAttendanceUnitpayServiceImpl implements ISurProjectAttendanceUnitpayService
+{
+ @Autowired
+ private SurProjectAttendanceUnitpayMapper surProjectAttendanceUnitpayMapper;
+
+
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊
+ *
+ * @param id 鍔宠祫绠＄悊涓婚敭
+ * @return 鍔宠祫绠＄悊
+ */
+ @Override
+ public SurProjectAttendanceUnitpay selectSurProjectAttendanceUnitpayById(Long id)
+ {
+ return surProjectAttendanceUnitpayMapper.selectSurProjectAttendanceUnitpayById(id);
+ }
+
+ /**
+ * 鏌ヨ鍔宠祫绠＄悊鍒楄〃
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 鍔宠祫绠＄悊
+ */
+ @Override
+ public List selectSurProjectAttendanceUnitpayList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay)
+ {
+ return surProjectAttendanceUnitpayMapper.selectSurProjectAttendanceUnitpayList(surProjectAttendanceUnitpay);
+ }
+
+ /**
+ * 鏂板鍔宠祫绠＄悊
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay)
+ {
+ surProjectAttendanceUnitpay.setCreateBy(SecurityUtils.getUsername());
+ surProjectAttendanceUnitpay.setCreateTime(DateUtils.getNowDate());
+ return surProjectAttendanceUnitpayMapper.insertSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay);
+ }
+
+ /**
+ * 淇敼鍔宠祫绠＄悊
+ *
+ * @param surProjectAttendanceUnitpay 鍔宠祫绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateSurProjectAttendanceUnitpay(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay)
+ {
+ surProjectAttendanceUnitpay.setUpdateBy(SecurityUtils.getUsername());
+ surProjectAttendanceUnitpay.setUpdateTime(DateUtils.getNowDate());
+ return surProjectAttendanceUnitpayMapper.updateSurProjectAttendanceUnitpay(surProjectAttendanceUnitpay);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鍔宠祫绠＄悊
+ *
+ * @param ids 闇瑕佸垹闄ょ殑鍔宠祫绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSurProjectAttendanceUnitpayByIds(Long[] ids)
+ {
+ return surProjectAttendanceUnitpayMapper.deleteSurProjectAttendanceUnitpayByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鍔宠祫绠＄悊淇℃伅
+ *
+ * @param id 鍔宠祫绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteSurProjectAttendanceUnitpayById(Long id)
+ {
+ return surProjectAttendanceUnitpayMapper.deleteSurProjectAttendanceUnitpayById(id);
+ }
+
+ @Override
+ public Long getPay(List payList, SurProjectAttendanceData it) {
+ for(SurProjectAttendanceUnitpay pay : payList){
+ if(StrUtil.equals(pay.getGroupName(),it.getGroupName()) && StrUtil.equals(pay.getWorkTypeName(),it.getWorkTypeName())){
+ it.setUnitPay(pay.getUnitPay());
+ return it.getDays()*pay.getUnitPay();
+ }
+ }
+ return 0l;
+ }
+
+ @Override
+ public List initList(SurProjectAttendanceUnitpay surProjectAttendanceUnitpay) {
+ int year= DateUtil.parse(DateUtil.now()).year();
+ surProjectAttendanceUnitpay.setYear(year);
+ return surProjectAttendanceUnitpayMapper.initList(surProjectAttendanceUnitpay);
+ }
+
+ @Override
+ public int addSurProjectAttendanceUnitpaies(List datas) {
+ if(datas.size()==0){
+ return 0;
+ }
+ Long cfgId= datas.get(0).getCfgId();
+ SurProjectAttendanceUnitpay where=new SurProjectAttendanceUnitpay();
+ where.setCfgId(cfgId);
+ List olds=surProjectAttendanceUnitpayMapper.selectSurProjectAttendanceUnitpayList(where);
+ List addIds=new ArrayList<>();
+ for(SurProjectAttendanceUnitpay it : datas){
+ if(it.getId()!=null){
+ surProjectAttendanceUnitpayMapper.updateSurProjectAttendanceUnitpay(it);
+ addIds.add(it.getId());
+ }else{
+ surProjectAttendanceUnitpayMapper.insertSurProjectAttendanceUnitpay(it);
+ }
+ }
+ for(SurProjectAttendanceUnitpay it : olds){
+ if(!addIds.contains(it.getId())){
+ surProjectAttendanceUnitpayMapper.deleteSurProjectAttendanceUnitpayById(it.getId());
+ }
+ }
+ return datas.size();
+ }
+}
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index 9f1d3f9d..2bf1db8f 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -450,6 +451,86 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_dept sd
where sd.dept_name = #{deptName}
+
+