Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -213,5 +213,10 @@ public class UserController {
     @RequestMapping("/batchUpdateRole")
     public HttpRespMsg batchUpdateRole(String userIds, Integer roleId) {return userService.batchUpdateRole(userIds, roleId, request); }
 
+    @RequestMapping("/importMonthCost")
+    public HttpRespMsg importMonthCost(@RequestParam MultipartFile file, String ymonth) {
+        return userService.importMonthCost(file, ymonth, request);
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/UserSalary.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2021-05-19
+ * @since 2022-10-19
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -61,6 +61,7 @@ public class UserSalary extends Model<UserSalary> {
     @TableField("salary_type")
     private Integer salaryType;
 
+
     /**
      * 更新时间
      */
@@ -68,6 +69,13 @@ public class UserSalary extends Model<UserSalary> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime indate;
 
+
+    /**
+     * 所属月份
+     */
+    @TableField("ymonth")
+    private String ymonth;
+
     public static UserSalary copyFromUser(User user) {
         UserSalary userSalary = new UserSalary();
         userSalary.setUserId(user.getId());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -73,4 +73,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg getUserListByRole(HttpServletRequest request);
 
     HttpRespMsg loginAdminByThirdParty(String jobNumber, String token);
+
+    HttpRespMsg importMonthCost(MultipartFile file, String ymonth, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/WxCorpInfoService.java

@@ -41,4 +41,6 @@ public interface WxCorpInfoService extends IService<WxCorpInfo> {
     public String syncTranslation(String authCorpid,String mediaId,String outPutFileName,String outputFileFormat) throws Exception;
 
     public String getSyncTranslationResult(String jobId) throws Exception;
+
+    public HttpRespMsg getUserPunchRecord(int companyId, String userId, LocalDateTime startDateTime, LocalDateTime endDateTime, boolean showLog);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -18,8 +18,10 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
+import org.apache.commons.io.FileUtils;
 import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -118,6 +120,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private UserSalaryMapper userSalaryMapper;
     @Resource
+    private UserSalaryService userSalaryService;
+    @Resource
     private UserVcodeMapper userVcodeMapper;
     @Resource
     private ProjectBasecostSettingMapper projectBasecostSettingMapper;
@@ -259,6 +263,154 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return httpRespMsg;
     }
 
+    @Override
+    public HttpRespMsg importMonthCost(MultipartFile multipartFile, String yearMonth, HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("TOKEN"));
+        Integer companyId = user.getCompanyId();
+        //然后处理文件
+        String fileName = multipartFile.getOriginalFilename();
+        File file = new File(fileName == null ? "file" : fileName);
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        try {
+            inputStream = multipartFile.getInputStream();
+            outputStream = new FileOutputStream(file);
+            byte[] buffer = new byte[4096];
+            int temp = 0;
+            while ((temp = inputStream.read(buffer, 0, 4096)) != -1) {
+                outputStream.write(buffer, 0, temp);
+            }
+            inputStream.close();
+            outputStream.close();
+            //然后解析表格
+            Workbook wb = WorkbookFactory.create(new FileInputStream(file));
+            Sheet sheet = wb.getSheetAt(0);
+            //要插入的账号列表
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
+            //获取月成本列表
+            TimeType timeType = timeTypeMapper.selectById(companyId);
+            //需要更新成本的人员数据
+            List<User> updateUserList = new ArrayList<>();
+            String startStr = yearMonth + "-01";
+            String endStr = yearMonth + "-31";
+            BigDecimal monthTotalHours = timeType.getMonthDays().multiply(new BigDecimal(timeType.getAllday()));
+            //由于第一行需要指明列对应的标题
+            for (int rowIndex = 0; rowIndex <= sheet.getLastRowNum(); rowIndex++) {
+                Row row = sheet.getRow(rowIndex);
+                if (row == null) {
+                    continue;
+                }
+                if (ExcelUtil.isRowEmpty(row)) {
+                    continue;
+                }
+                //工号 姓名 薪资
+                Cell jobNumberCell = row.getCell(0);
+
+                if (jobNumberCell != null) {
+                    jobNumberCell.setCellType(CellType.STRING);
+                }
+
+                Cell nameCell = row.getCell(1);
+                Cell salaryCell = row.getCell(2);
+                nameCell.setCellType(CellType.STRING);
+
+                String name = nameCell.getStringCellValue().trim().replaceAll("\\u00a0", "");
+                if (name.equals(MessageUtils.message("entry.name")) && rowIndex == 0) {
+                    continue;
+                }
+                String cellJobNumber = jobNumberCell != null ?jobNumberCell.getStringCellValue().trim().replaceAll("\\u00a0", ""):null;
+                Optional<User> first = null;
+                if (!StringUtils.isEmpty(cellJobNumber)) {
+                    //优先按照工号匹配
+                    first = userList.stream().filter(u ->
+                            u.getJobNumber() != null && u.getJobNumber().equals(cellJobNumber)).findFirst();
+                }
+                if (first == null || !first.isPresent()) {
+                    //按照姓名匹配
+                    first = userList.stream().filter(u ->
+                            u.getName().equals(name)).findFirst();
+                }
+                if (first != null && first.isPresent()) {
+                    if (salaryCell != null) {
+                        salaryCell.setCellType(CellType.STRING);
+                        String item = salaryCell.getStringCellValue();
+                        BigDecimal monthSalary = item != null ? new BigDecimal(item.trim().replaceAll("\\u00a0", "")) : BigDecimal.valueOf(0);
+                        User localUser = new User();
+                        User findUser = first.get();
+                        localUser.setId(findUser.getId());
+                        localUser.setMonthCost(monthSalary);
+                        localUser.setName(findUser.getName());
+                        localUser.setSalaryType(findUser.getSalaryType());
+                        //计算时薪
+                        localUser.setCost(monthSalary.divide(monthTotalHours, 6, BigDecimal.ROUND_HALF_UP));
+                        updateUserList.add(localUser);
+                    } else {
+                        //薪资为空的跳过
+                        continue;
+                    }
+                } else {
+                    msg.setError(MessageUtils.message("group.userNullById",name,cellJobNumber));
+                    return msg;
+                }
+            }
+
+            if (updateUserList.size() > 0) {
+                //有人员薪资更新
+                updateBatchById(updateUserList);
+                //记录薪资变动
+                List<UserSalary> salaryChangeList = new ArrayList<>();
+                for (User u : updateUserList) {
+                    UserSalary salary = UserSalary.copyFromUser(u);
+                    salary.setYmonth(yearMonth);
+                    salaryChangeList.add(salary);
+                }
+                userSalaryService.saveBatch(salaryChangeList);
+            }
+            //更新该月份的日报相关的成本
+            if (!StringUtils.isEmpty(yearMonth)) {
+                List<Report> reportList = reportMapper.selectSimpleTime(companyId, startStr, endStr);
+                if (reportList.size() > 0) {
+                    List<Report> updateReportList = new ArrayList<>();
+                    for (Report r : reportList) {
+                        Optional<User> first = updateUserList.stream().filter(u -> u.getId().equals(r.getCreatorId())).findFirst();
+                        if (first.isPresent()) {
+                            BigDecimal hourCost = first.get().getCost();
+                            r.setCost(hourCost.multiply(new BigDecimal(r.getWorkingTime())));
+                            r.setCreatorId(null);
+                            r.setWorkingTime(null);
+                            updateReportList.add(r);
+                        }
+                    }
+                    //批量更新日报的成本
+                    if (updateReportList.size() > 0) {
+                        reportService.updateBatchById(updateReportList);
+                    }
+                }
+            }
+        }catch (IOException e){
+            e.printStackTrace();
+            //msg.setError("文件处理错误");
+            msg.setError(MessageUtils.message("file.error"));
+        }catch (InvalidFormatException e) {
+            e.printStackTrace();
+            //msg.setError("文件格式错误，如果安装了加密软件需要先解密再上传");
+            msg.setError(MessageUtils.message("file.FormatErrorAndDecrypt"));
+        } finally {
+            //关闭流
+            try {
+                if (outputStream != null && inputStream != null) {
+                    outputStream.close();
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            System.out.println(file.delete());
+        }
+        return msg;
+    }
+
 
     public void setUserRoleMenu(UserVO user) {
         Integer roleId = user.getRoleId();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.management.platform.controller.WeiXinCorpController;
 import com.management.platform.entity.*;
@@ -14,6 +15,7 @@ import com.management.platform.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.HttpClientUtils;
+import org.apache.tomcat.jni.Local;
 import org.json.HTTP;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -22,6 +24,7 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.unit.DataUnit;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 import sun.net.www.http.HttpClient;
@@ -29,6 +32,7 @@ import sun.net.www.http.HttpClient;
 import javax.annotation.Resource;
 import java.io.*;
 import java.lang.reflect.Array;
+import java.math.BigDecimal;
 import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -55,6 +59,10 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
 
     public static final String GET_CHECKIN_DAYDATA = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckin_daydata?access_token=ACCESS_TOKEN";
 
+    public static final String GET_CHECKIN_DATA = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=ACCESS_TOKEN";
+
+    public static final String GET_CHECKIN_OPTION = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckinoption?access_token=ACCESS_TOKEN";
+
 
     @Value("${suitId}")
     private String suitId;
@@ -452,6 +460,153 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getUserPunchRecord(int companyId, String userId, LocalDateTime startDateTime, LocalDateTime endDateTime, boolean showLog) {
+        HttpRespMsg msg = new HttpRespMsg();
+        WxCorpInfo corpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
+        if (corpInfo == null) {
+            //msg.setError("该企业未对接企业微信");
+            msg.setError(MessageUtils.message("wx.dockError"));
+            return msg;
+        }
+        String url = null;
+        try {
+            startDateTime = startDateTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
+            long startTime = startDateTime.toEpochSecond(ZoneOffset.of("+8"));
+            endDateTime = endDateTime.withHour(23).withMinute(59).withSecond(0).withNano(0);
+            long endTime = endDateTime.toEpochSecond(ZoneOffset.of("+8"));
+            System.out.println("startTime=" + startTime + ",endTime=" + endTime);
+
+            int batchCount = 1;
+            int batchSize = 100;
+            int totalLength = 1;
+            List<String> corpwxUserIds = new ArrayList<>();
+            if (userId == null) {
+                //获取企业下的全部员工
+                List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).isNotNull("corpwx_userid").eq("is_active", 1));
+                System.out.println("获取考勤记录users size==" + users.size());
+                corpwxUserIds = users.stream().map(User::getCorpwxUserid).collect(Collectors.toList());
+                totalLength = corpwxUserIds.size();
+                batchCount = totalLength / batchSize + (totalLength % batchSize == 0 ? 0 : 1);
+            } else {
+                //指定获取员工
+                User user = userMapper.selectById(userId);
+                corpwxUserIds.add(user.getCorpwxUserid());
+                System.out.println("获取corpwxuserid==" + user.getCorpwxUserid() + "的考勤记录");
+            }
+            //按批调用
+            for (int i = 0; i < batchCount; i++) {
+                int fromIndex = i * batchSize;
+                int toIndex = (i + 1) * batchSize;
+                if (toIndex > totalLength) toIndex = totalLength;
+                Object[] objects = corpwxUserIds.subList(fromIndex, toIndex).toArray(new String[0]);
+                reqPunchRecord(corpInfo, startTime, endTime, objects, showLog);
+            }
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+
+        return msg;
+    }
+
+    public void reqPunchRecord(WxCorpInfo corpInfo, long startTime, long endTime, Object[] objects, boolean showLog)throws Exception {
+        DateTimeFormatter mdFormat = DateTimeFormatter.ofPattern("yyyy/M/d");
+        LocalDateTime needDataTime = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);
+        long dataTime = needDataTime.toEpochSecond(ZoneOffset.of("+8"));
+        String checkinOption = getCheckinOption(corpInfo, dataTime, objects);
+        JSONObject optionObject = JSONObject.parseObject(checkinOption);
+        JSONArray  optionDatas= optionObject.getJSONArray("info");
+        String url = GET_CHECKIN_DATA.replace("ACCESS_TOKEN", getCorpAccessToken(corpInfo));
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        System.out.println("" + objects.toString());
+        JSONObject reqParam = new JSONObject();
+        reqParam.put("starttime", startTime);
+        reqParam.put("endtime", endTime);
+        reqParam.put("useridlist", objects);
+        reqParam.put("opencheckindatatype", 3);
+        HttpEntity<String> requestEntity = new HttpEntity<String>(reqParam.toJSONString(), headers);
+        ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
+                HttpMethod.POST, requestEntity, String.class);
+
+        if (responseEntity.getStatusCode() == HttpStatus.OK) {
+            String resp = responseEntity.getBody();
+            if (showLog) System.out.println(resp);
+            JSONObject json = JSONObject.parseObject(resp);
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            if (json.getIntValue("errcode") == 0) {
+                JSONArray checkindata = json.getJSONArray("checkindata");
+                System.out.println(checkindata);
+                for (int i = 0; i < objects.length; i++) {
+                    List<Integer> upList=new ArrayList<>();
+                    List<Integer> downList=new ArrayList<>();
+                    for (int j = 0; j < checkindata.size(); j++) {
+                        JSONObject jsonObject = checkindata.getJSONObject(j);
+                        if (jsonObject.get("userid").equals(objects[i])) {
+                            //todo: 获取最早上班打卡时间以及最晚下班打卡时间
+                            Integer time = (Integer) jsonObject.get("checkin_time");
+                            if (jsonObject.get("checkin_type").equals("上班打卡")) {
+                                upList.add(time);
+                            } else if(jsonObject.get("checkin_type").equals("下班打卡")) downList.add(time);
+                        }
+                    }
+                    double restTime = 0.0;//小时为单位
+                    for (int k = 0; k < optionDatas.size(); k++) {
+                        if(optionDatas.getJSONObject(k).get("userid").equals(objects[i])){
+                            JSONObject group = optionDatas.getJSONObject(k).getJSONObject("group");
+                            JSONArray workRules = group.getJSONArray("checkindate").getJSONObject(0).getJSONArray("checkintime");
+                            if (workRules.size() <= 1) {
+                                restTime = 1.0;//一个小时午休
+                            } else {
+                                restTime = 1.0 * (workRules.getJSONObject(1).getIntValue("work_sec") - workRules.getJSONObject(0).getIntValue("off_work_sec")) / 3600;
+                            }
+                        }
+                    }
+                    UserCorpwxTime userCorpwxTime=new UserCorpwxTime();
+                    userCorpwxTime.setCorpwxUserid((String) objects[i]);
+                    userCorpwxTime.setCompanyId(corpInfo.getCompanyId());
+                    for (Integer integer : upList) {
+                        if(objects[i].equals("woy9TkCAAArkpTq76GOJYsbYGgzk1g1w")){
+                            System.out.println("上班"+DateTimeUtil.getTimeFromSeconds(integer));
+                        }
+                    }
+                    for (Integer integer : downList) {
+                        if(objects[i].equals("woy9TkCAAArkpTq76GOJYsbYGgzk1g1w")){
+                            System.out.println("下班"+DateTimeUtil.getTimeFromSeconds(integer));
+                        }
+                    }
+                    if(upList.isEmpty()||downList.isEmpty()){
+                        continue;
+                    }
+                    Integer min = Collections.min(upList);
+                    Integer max = Collections.max(downList);
+                    String minTime = DateTimeUtil.getTimeFromSeconds(min);
+                    String maxTime = DateTimeUtil.getTimeFromSeconds(max);
+                    DateTimeFormatter df = DateTimeFormatter.ofPattern("HH:mm");
+                    userCorpwxTime.setStartTime(LocalTime.parse(minTime,df).plusHours(8).format(df));
+                    userCorpwxTime.setEndTime(LocalTime.parse(maxTime,df).plusHours(8).format(df));
+                    userCorpwxTime.setCreateDate(LocalDate.now());
+                    userCorpwxTime.setWxCorpid(corpInfo.getCorpid());
+                    userCorpwxTime.setWeekDay(LocalDate.now().getDayOfWeek().getValue());
+                    userCorpwxTime.setWeekDayTxt(DateTimeUtil.getWeekDayTxt(userCorpwxTime.getWeekDay()));
+                    BigDecimal bigDecimal=new BigDecimal(Duration.between(LocalTime.parse(minTime,df).plusHours(8),LocalTime.parse(maxTime,df).plusHours(8)).toMinutes());
+                    bigDecimal=bigDecimal.divide(BigDecimal.valueOf(60),1,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(restTime));
+                    userCorpwxTime.setWorkHours(bigDecimal.doubleValue());
+                    System.out.println(userCorpwxTime);
+                    UserCorpwxTime item = userCorpwxTimeMapper.selectOne(new QueryWrapper<UserCorpwxTime>().eq("corpwx_userid", (String) objects[i])
+                            .eq("create_date", LocalDate.now()));
+                    if (item != null) {
+                        userCorpwxTime.setId(item.getId());
+                        //已存在记录，进行更新
+                        userCorpwxTimeMapper.updateById(userCorpwxTime);
+                    } else {
+                        userCorpwxTimeMapper.insert(userCorpwxTime);
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public HttpRespMsg syncMembByCardTime(WxCorpInfo wxCorpInfo) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -527,6 +682,25 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
         return msg;
     }
 
+    private String getCheckinOption(WxCorpInfo corpInfo,long dataTime,Object[] objects) throws  Exception{
+        String url = GET_CHECKIN_OPTION.replace("ACCESS_TOKEN", getCorpAccessToken(corpInfo));
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        System.out.println("" + objects.toString());
+        JSONObject reqParam = new JSONObject();
+        reqParam.put("datetime", dataTime);
+        reqParam.put("useridlist", objects);
+        HttpEntity<String> requestEntity = new HttpEntity<String>(reqParam.toJSONString(), headers);
+        ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
+                HttpMethod.POST, requestEntity, String.class);
+
+        if (responseEntity.getStatusCode() == HttpStatus.OK) {
+            String resp = responseEntity.getBody();
+            return resp;
+        }
+        return "";
+    }
+
 
     private void reqOnceCardTime(WxCorpInfo corpInfo, long startTime, long endTime, Object[] objects, boolean showLog) throws Exception {
         DateTimeFormatter mdFormat = DateTimeFormatter.ofPattern("yyyy/M/d");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -472,8 +472,21 @@ public class TimingTask {
         }
     }
 
+    @Scheduled(cron = "0 30,0/5 17-19 * * ?")
+    public void  getClockRecordWithCorpWx(){
+        /*if(isDev) return;*/
+        //todo: 有限制无考勤不填报的情况才获取
+        LocalDateTime start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+        LocalDateTime end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX).withSecond(0).withNano(0);
+        List<TimeType> typeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("not_allowed_no_attendance", 1));
+        for (TimeType type : typeList) {
+            Integer companyId = type.getCompanyId();
+            wxCorpInfoService.getUserPunchRecord(companyId, null, start, end, false);
+        }
+    }
+
     public static void main(String[] args) {
-        int passwordLength = 30;
+        /*int passwordLength = 30;
         List<String> stringList=new ArrayList<>();
         new SecureRandom().ints(passwordLength, 0, VALID_TOKEN_CHARS.size())
                 .map(VALID_TOKEN_CHARS::get).forEach(v->stringList.add(String.valueOf((char) v)));
@@ -481,7 +494,10 @@ public class TimingTask {
         for (String s : stringList) {
             token+=s;
         }
-        System.out.println(token);
+        System.out.println(token);*/
+        LocalDateTime start = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+        LocalDateTime end = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+        System.out.println(start+"  "+end);
     }
 
     //发送上周填写的工时统计

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -78,10 +78,10 @@
     </if>
         <if test="stateKey!=null">
             <if test="stateKey==1">
-                a.state = 1 or a.state=0
+                (a.state = 1 or a.state = 0 or a.state = -1)
             </if>
             <if test="stateKey==2">
-                a.state=0
+                (a.state=0 or a.state = -1)
             </if>
         </if>)
         <if test="startDate != null and startDate != ''">
@@ -160,10 +160,10 @@
     </if>
         <if test="stateKey!=null">
             <if test="stateKey==1">
-                a.state = 1 or a.state=0
+                (a.state = 1 or a.state=0 or a.state = -1)
             </if>
             <if test="stateKey==2">
-                a.state=0
+                (a.state=0 or a.state = -1)
             </if>
         </if>)
         <if test="startDate != null and startDate != ''">
@@ -207,10 +207,10 @@
         </if>
         <if test="stateKey!=null">
             <if test="stateKey==1">
-                a.state = 1 or a.state=0
+                (a.state = 1 or a.state=0 or a.state = -1)
             </if>
             <if test="stateKey==2">
-                a.state=0
+                (a.state=0 or a.state = -1)
             </if>
         </if>
         )

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/UserSalaryMapper.xml

@@ -11,11 +11,12 @@
         <result column="cost" property="cost" />
         <result column="salary_type" property="salaryType" />
         <result column="indate" property="indate" />
+        <result column="ymonth" property="ymonth" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, user_name, month_cost, cost, salary_type, indate
+        id, user_id, user_name, month_cost, cost, salary_type, indate, ymonth
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -191,7 +191,7 @@
         </el-dialog>
         <!-- 其他设置 -->
         <el-dialog v-if="editDialogG" :visible.sync="editDialogG" title="其他设置">
-            <el-form label-width="100px">
+            <el-form label-width="100px" class="otherForm">
                 <el-form-item><el-checkbox v-model="dialogData.reportWorkflow">是否开启审批流设置</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.needEvaluate">审核通过需输入评价</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.mainProjectState">是否启用主项目模式</el-checkbox></el-form-item>
@@ -803,4 +803,11 @@
     margin-left: 10px;
     margin-bottom: 5px;
 }
+</style>
+<style>
+.otherForm .el-form-item{
+    float: left;
+    width: 50%;
+    margin: 0;
+}
 </style>

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -984,6 +984,7 @@
   "create": "create",
   "gong": "common",
   "addpersonnel": "Add people",
+  "importSalary": "Import Salary",
   "associateenterprisemicroidentity": "Affiliated Enterprise and Micro Identity",
   "customConfiguration": "custom configuration",
   "exportpersonnel": "Export people",
@@ -1052,6 +1053,7 @@
   "configurationoptions": "configuration options",
   "newConfigurationOptions": "Added configuration options",
   "personnelimporttemplate": "Person Import Template",
+  "salaryTemplate": "Salary Import Template",
   "oneWeix": "1. Fill in the corporate WeChat address book Secret",
   "synchronizetheenterprisewechataddressbook": "Synchronize corporate WeChat address book",
   "firststep": "Step 1: Enter the management background",

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -987,6 +987,7 @@
   "customConfiguration": "自定义配置",
   "exportpersonnel": "导出人员",
   "addpersonnel": "添加人员",
+  "importSalary": "导入薪资",
   "associateenterprisemicroidentity": "关联企微身份",
   "synchronizetheenterprisemicrodirectory": "同步企微通讯录",
   "synchronizetheaddressbook": "同步钉钉通讯录",
@@ -1052,6 +1053,7 @@
   "addededitedconfigurationoptions": "新增/编辑配置选项",
   "batchimportofpersonnel": "人员批量导入",
   "personnelimporttemplate": "人员导入模板",
+  "salaryTemplate": "薪资导入模板",
   "synchronizetheenterprisewechataddressbook": "同步企业微信通讯录",
   "oneWeix": "1. 填写企业微信通讯录Secret",
   "firststep": "第一步:进入管理后台",

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -108,6 +108,9 @@
                                         <span v-if="index < groupDetailData.participators.length - 1">、</span>
                                     </span>
                                 </el-form-item>
+                                <el-form-item label="wbsCode" v-if="user.companyId == 936">
+                                    <span>{{groupDetailData.wbsCode}}</span>
+                                </el-form-item>
                             </el-form>
                         </div>
                         <span slot="footer" class="dialog-footer">

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -100,6 +100,10 @@
                     <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureAdd && user.userNameNeedTranslate != '1'">
                         <el-link type="primary" :underline="false" @click="openInsertDialog(null)">{{ $t('addpersonnel') }}</el-link>
                     </el-form-item>
+                    <!--导入薪资-->
+                    <el-form-item style="float:right;" v-if="permissions.structurePersonnel">
+                        <el-link type="primary" :underline="false" @click="importUserSalary(null)">{{ $t('importSalary') }}</el-link>
+                    </el-form-item>
                     
                     <el-form-item style="float:right;" v-if="user.dingdingUserid == null && permissions.structureImport && user.userNameNeedTranslate != '1'">
                         <el-link type="primary" :underline="false" @click="importUserC">{{ $t('bulkimport') }}</el-link>
@@ -636,6 +640,23 @@
             </el-upload>
             </p>
         </el-dialog>
+        <!--薪资导入-->
+        <el-dialog :title="$t('importSalary')" v-if="importUserSalaryDialog" :visible.sync="importUserSalaryDialog" customClass="customWidth" width="500px">
+            <p>1. {{ $t('other.download') }}
+            <el-link type="primary" style="margin-left:5px;" :underline="false" href="./upload/薪资导入模板.xlsx" :download="$t('salaryTemplate')+'.xlsx'">{{$t('salaryTemplate')}}.xlsx</el-link>
+            </p>
+            <p>2. 
+              {{ $t('Selectmonth') }}
+              <el-date-picker v-model="ymonth" type="month" :placeholder="$t('Selectmonth')" format="yyyy-MM" value-format="yyyy-MM"></el-date-picker>
+              <br/><span style="margin-left:10px;margin-top:8px;color:#999;">({{$t('Recalculatereportedcostsforthemonth')}})</span>
+            </p>
+            <p>3. {{ $t('exceltemplateanduploadit') }}。</p>
+            <p style="display: flex;justify-content: center;padding-bottom:1em;">
+                <el-upload ref="uploadSalaryRef"  action="#" :limit="1" :http-request="importSalaryData" :show-file-list="false">
+                <el-button type="primary" :underline="false" :loading="importingSalaryData">{{ $t('other.startImporting') }}</el-button>
+            </el-upload>
+            </p>
+        </el-dialog>
         <el-dialog :title="$t('synchronizetheenterprisewechataddressbook')" v-if="showSyncCWDialog" :visible.sync="showSyncCWDialog" customClass="customWidth" width="500px">
             <p>{{ $t('oneWeix') }} 
                 <el-popover placement="top" width="1200" trigger="hover">
@@ -730,6 +751,9 @@ export default {
   },
   data() {
     return {
+      syncHistoryReport: true,
+      ymonth: null,
+      importingSalaryData: false,
       translation: '1', // 1、文字, 2、部门, 3、人员
       fullscreenLoading: false,
       syncMembByCardTimeResultGialog:false,
@@ -902,6 +926,7 @@ export default {
       status: "1",
       role: "",
       jDarr: [],
+      importUserSalaryDialog: false,
       handleSelectionZzjgDate: [],
       handleSelectionZzjgwillchange: null,
       acquireRoleList: [], // 角色列表
@@ -1958,6 +1983,9 @@ export default {
     importUserC() {
       this.importDialog = true;
     },
+    importUserSalary() {
+      this.importUserSalaryDialog = true;
+    },
     // 批量导入人员
     importUser(item) {
       //首先判断文件类型
@@ -2007,6 +2035,55 @@ export default {
         );
       }
     },
+    //导入人员薪资
+    importSalaryData(item) {
+      //首先判断文件类型
+      let str = item.file.name.split(".");
+      let format = str[str.length - 1];
+
+      if (format != "xls" && format != "xlsx") {
+        this.$message({
+          message: this.$t('other.PleaseselecttheXLSorXLSXfile'),
+          type: "error",
+        });
+      } else {
+        let formData = new FormData();
+        formData.append("file", item.file);
+        formData.append("ymonth", this.ymonth);
+        this.importingSalaryData = true;
+        this.http.uploadFile(
+          "/user/importMonthCost",
+          formData,
+          (res) => {
+            this.importingSalaryData = false;
+            this.$refs.uploadSalaryRef.clearFiles();
+            this.listLoading = false;
+            if (res.code == "ok") {
+              this.$message({
+                message: this.$t('other.importSuccess'),
+                type: "success",
+              });
+              //重新读取列表
+              this.getUser();
+              this.importUserSalaryDialog = false;
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error",
+              });
+            }
+          },
+          (error) => {
+            this.importingSalaryData = false;
+            this.$refs.uploadSalaryRef.clearFiles();
+            this.$message({
+              message: error,
+              type: "error",
+            });
+          }
+        );
+      }
+    },
 
     //分页
     handleCurrentChange(val) {
@@ -3151,6 +3228,7 @@ export default {
   },
   mounted() {
     this.deactiveDate = util.formatDate.format(new Date(), "yyyy-MM-dd");
+    this.ymonth = util.formatDate.format(new Date(), "yyyy-MM");
     this.getDepartment();
     this.getUser();
     this.getCompanyTimeSetting();

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -12,7 +12,7 @@
                     </div>
                 </van-grid-item>
             </van-grid>
-            <van-grid :column-num="weekIndex" :border="false" style="position:relative">
+            <van-grid :column-num="weekIndex == 7 ? weekIndex : weekIndex + 1" :border="false" style="position:relative">
                 <van-grid-item v-for="item,index in dateRange" :key="index" :class="index == inbtn ? 'inbtn' : ''">
                     <van-button
                     class="selectgxbtn"
@@ -21,6 +21,9 @@
                     @click="switchWeek(item,index)"
                     :disabled="canSelect(item)">{{weekArr[index]}}</van-button>
                 </van-grid-item>
+                <van-grid-item v-if="weekIndex != 7">
+                    <van-button type="default" size="mini" class="selectgxbtn" @click="addWeekIndex()" icon="plus"></van-button>
+                </van-grid-item>
                 <div class="kaoqin" v-if="kaoqinText"><span>当日考勤记录：</span><span>{{kaoqinText}}</span></div>
                 <div class="kaoqin" v-if="workTimeText"><span>已填报工时：</span><span>{{workTimeText}}小时</span></div>
                 <div class="submitClear">
@@ -429,7 +432,7 @@
 
                 dateRange: [],  //周时间数组
                 dateText: [],   //时间段字符串
-                weekArr: ['周一','周二','周三','周四','周五','周六'],
+                weekArr: ['周一','周二','周三','周四','周五','周六','周日'],
                 inbtn: 0,
                 weekIndex: 5,
                 weekSwitchIndex: 1,
@@ -524,23 +527,6 @@
             },
             // 切换星期
             switchWeek(item,index){
-                // if(this.user.timeType.notAllowedNoAttendance == 1){
-                //     let havework = false
-                //     for(let i in this.currentForm.domains){
-                //         if(this.currentForm.domains[i].projectId){
-                //             havework = true
-                //         }
-                //     }
-                //     if(havework){
-                //         if(this.kaoqinText){
-                //             if(this.currentForm.cardtime == 0){
-                //                 this.$toast.fail('无考勤记录' + this.weekArr[this.inbtn] +'不可填报')
-                //             }
-                //         }else{
-                //             this.$toast.fail('无考勤记录' + this.weekArr[this.inbtn] +'不可填报')
-                //         }
-                //     }
-                // }
                 this.form[this.inbtn] = this.currentForm
                 this.inbtn = index
                 this.currentForm = this.form[this.inbtn]
@@ -552,6 +538,37 @@
                 this.getKaoqin()
                 this.getWorkTime()
             },
+            addWeekIndex(){
+                console.log(this.weekIndex, this.dateRange);
+                if(this.dateRange.length < 7){
+                    this.weekIndex += 1
+                    let time = this.dateRange[this.dateRange.length - 1]
+                    this.dateRange.push(new Date(time.getFullYear(),time.getMonth(),time.getDate()+1))
+                    let time2 = new Date(this.dateText[1])
+                    let time3 = new Date(time2.getFullYear(),time2.getMonth(),time2.getDate()+1)
+                    this.dateText[1] = this.format(time3,'yyyy-MM-dd')
+                    this.form.push({
+                            createDate: this.format(this.dateRange[this.dateRange.length - 1],"yyyy-MM-dd"),
+                            domains: [{
+                                id: null,
+                                projectId: "",
+                                projectName: "",
+                                workingTime: this.user.timeType.allday,
+                                content: "",
+                                progress: 100,
+                                state: 2,
+                                multiWorktime:0,
+                                worktimeList:[{}],
+                                degreeId: '',
+
+                                auditorFirst: {name:'',id:''},
+                                auditorSec: {name:'',id:''},
+                                auditorThird: {name:'',id:''},
+                                ccUserid: {name:'',id:''}
+                            }],
+                        })
+                }
+            },
             
             // 获取日考勤记录
             getKaoqin(){
@@ -602,6 +619,8 @@
             getDateRange(){
                 if(this.user.companyId == 817){
                     this.weekIndex = 6
+                }else{
+                    this.weekIndex = 5
                 }
                 let nowDate = new Date()
                 let nowWeekday = nowDate.getDay()
@@ -1926,7 +1945,6 @@
         },
         
         mounted() {
-            this.user.timeType.notAllowedNoAttendance = 1
             this.timeRange = []
             for(let i=0.5; i<=20; i+=0.5){
                 this.timeRange.push(i)

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -400,6 +400,7 @@ export default {
         }
     }
     .addtaskicon{
+        opacity: 0.5;
         position: fixed;
         z-index: 1000;
         font-size: 50px;