update code

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/AttendanceUbiDataController.java

@@ -61,7 +61,7 @@ public class AttendanceUbiDataController extends BaseController
             attendanceUbiData.setUserIds(userIds);
             List<AttendanceUbiData> userDatas=attendanceUbiDataService.queryStatisticsByUserIds(attendanceUbiData);
             //处理汇总数据
-            List<AttendanceUbiData> retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), datas,userDatas);
+            List<AttendanceUbiData> retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), datas,userDatas,false);
             data.setRows(retUsers);
         }
         return  data;
@@ -83,7 +83,7 @@ public class AttendanceUbiDataController extends BaseController
             Calendar calendar = new GregorianCalendar(inTime.getYear(), inTime.getMonth(), 1);
             int daysInMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
             //处理汇总数据
-            List<AttendanceUbiData> retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), list,userDatas);
+            List<AttendanceUbiData> retUsers= attendanceUbiDataService.procStatistics(attendanceUbiData.getInTime(), list,userDatas,true);
             ExcelUtil<AttendanceUbiData> util = new ExcelUtil<AttendanceUbiData>(AttendanceUbiData.class){
                 @Override
                 public void writeSheet() {
@@ -130,7 +130,7 @@ public class AttendanceUbiDataController extends BaseController
 
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("utf-8");
-            util.init(list, "考勤管理数据", "", Excel.Type.EXPORT);
+            util.init(retUsers, "考勤管理数据", "", Excel.Type.EXPORT);
             util.exportExcel(response);
         }
     }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamInfoController.java

@@ -7,6 +7,7 @@ import com.yanzhu.common.core.web.page.TableDataInfo;
 import com.yanzhu.common.log.annotation.Log;
 import com.yanzhu.common.log.enums.BusinessType;
 import com.yanzhu.common.security.annotation.RequiresPermissions;
+
 import com.yanzhu.manage.domain.BusExamInfo;
 import com.yanzhu.manage.service.IBusExamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IAttendanceUbiDataService.java

@@ -75,5 +75,5 @@ public interface IAttendanceUbiDataService
      */
     List<AttendanceUbiData> queryStatisticsByUserIds(AttendanceUbiData attendanceUbiData);
 
-    List<AttendanceUbiData> procStatistics(Date inTime, List<AttendanceUbiData> datas, List<AttendanceUbiData> userDatas);
+    List<AttendanceUbiData> procStatistics(Date inTime, List<AttendanceUbiData> datas, List<AttendanceUbiData> userDatas,boolean updateCraft);
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java

@@ -2,12 +2,15 @@ package com.yanzhu.manage.service.impl;
 
 import java.util.*;
 
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
 import com.yanzhu.common.core.context.SecurityContextHolder;
 import com.yanzhu.common.core.utils.DateUtils;
 import com.yanzhu.common.core.utils.StringUtils;
 import com.yanzhu.manage.domain.AttendanceUbiData;
 import com.yanzhu.manage.mapper.AttendanceUbiDataMapper;
 import com.yanzhu.manage.service.IAttendanceUbiDataService;
+import com.yanzhu.system.api.domain.SysDictData;
+import com.yanzhu.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +27,8 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
     private AttendanceUbiDataMapper attendanceUbiDataMapper;
 
 
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
     /**
      * 查询考勤管理
      * 
@@ -116,8 +121,17 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
     }
 
     @Override
-    public List<AttendanceUbiData> procStatistics(Date inTime, List<AttendanceUbiData> datas, List<AttendanceUbiData> userDatas) {
+    public List<AttendanceUbiData> procStatistics(Date inTime, List<AttendanceUbiData> datas, List<AttendanceUbiData> userDatas,boolean updateCraft) {
         List<AttendanceUbiData> users=new ArrayList<>();
+        List<SysDictData> craftTypes=null;
+        List<SysDictData> craftPosts=null;
+        if(updateCraft) {
+            SysDictData where=new SysDictData();
+            where.setDictType("pro_craft_type");
+            craftTypes = dictDataMapper.selectDictDataList(where);
+            where.setDictType("pro_craft_post");
+            craftPosts = dictDataMapper.selectDictDataList(where);
+        }
         if(datas.size()==0){
             return users;
         }
@@ -131,6 +145,10 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
                 if(j==0){
                     fd.setDays(days);
                     users.add(fd);
+                    if(updateCraft){
+                        fd.setCraftType(getUserCraft(fd.getCraftType(),craftTypes));
+                        fd.setCraftPost(getUserCraft(fd.getCraftPost(),craftPosts));
+                    }
                 }
                 j++;
                 Date dt=fd.getInTime();
@@ -151,6 +169,15 @@ public class AttendanceUbiDataServiceImpl implements IAttendanceUbiDataService
         return  users;
     }
 
+    private String getUserCraft(String val, List<SysDictData> dicts) {
+        for(SysDictData dic:dicts){
+            if(val.equals(dic.getDictValue())){
+                return  dic.getDictLabel();
+            }
+        }
+        return val;
+    }
+
     private List<AttendanceUbiData> findUserDatas(AttendanceUbiData ad, List<AttendanceUbiData> userDatas) {
         List<AttendanceUbiData> list=new ArrayList<>();
         for(AttendanceUbiData it :userDatas){

yanzhu-modules/yanzhu-system/pom.xml

@@ -84,6 +84,12 @@
             <groupId>com.yanzhu</groupId>
             <artifactId>yanzhu-common-datascope</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yanzhu</groupId>
+            <artifactId>yanzhu-common-mapper</artifactId>
+            <version>3.6.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java

@@ -2,10 +2,10 @@ package com.yanzhu.system.service.impl;
 
 import java.util.List;
 
+import com.yanzhu.common.security.utils.DictUtils;
 import com.yanzhu.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.yanzhu.common.security.utils.DictUtils;
 import com.yanzhu.system.api.domain.SysDictData;
 import com.yanzhu.system.service.ISysDictDataService;
 

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 
+import com.yanzhu.common.security.utils.DictUtils;
 import com.yanzhu.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,7 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.yanzhu.common.core.constant.UserConstants;
 import com.yanzhu.common.core.exception.ServiceException;
 import com.yanzhu.common.core.utils.StringUtils;
-import com.yanzhu.common.security.utils.DictUtils;
 import com.yanzhu.system.api.domain.SysDictData;
 import com.yanzhu.system.api.domain.SysDictType;
 import com.yanzhu.system.mapper.SysDictTypeMapper;

yanzhu-ui-vue3/src/views/manage/attendanceUbiData/statistics.vue

@@ -116,8 +116,17 @@ function getProjectList() {
 }
 
 function handleExport(){
+    let queryData={
+        projectId:queryParams.value.projectId,
+        subDeptId:queryParams.value.subDeptId
+    }
+    let dt1=proxy.$dt(queryParams.value.inTime);
+    let dt2=dt1.month(dt1.month()+1);   
+    queryData.inTime=dt1.format("YYYY-MM-01");
+    queryData.outTime=dt2.format("YYYY-MM-01");    
+
     proxy.download('manage/attendanceUbiData/statisticsExport', {
-    ...queryParams.value
+    ...queryData
   }, `attendanceUbiData_${new Date().getTime()}.xlsx`)
 }