提交

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/config/Swagger2Config.java

@@ -29,8 +29,7 @@ import static com.google.common.collect.Lists.newArrayList;
 @EnableSwagger2
 public class Swagger2Config extends WebMvcConfigurationSupport {
     //api接口包扫描路径
-    private static final String SWAGGER_SCAN_BASE_PACKAGE_controller = "com.qy.worksheetsystem.controller";
-    private static final String SWAGGER_SCAN_BASE_PACKAGE_vo = "com.qy.worksheetsystem.vo";
+    private static final String SWAGGER_SCAN_BASE_PACKAGE = "com.qy.worksheetsystem.controller";
     private static final String VERSION = "1.0.0";
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -48,7 +47,7 @@ public class Swagger2Config extends WebMvcConfigurationSupport {
                 .apiInfo(apiInfo())
                 //.securitySchemes(security())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage(SWAGGER_SCAN_BASE_PACKAGE_controller))
+                .apis(RequestHandlerSelectors.basePackage(SWAGGER_SCAN_BASE_PACKAGE))
                 .paths(PathSelectors.any())
                 .build();
     }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/PersonWorkController.java

@@ -2,10 +2,6 @@ package com.qy.worksheetsystem.controller;
 
 import com.qy.worksheetsystem.model.MessageResult;
 
-import com.qy.worksheetsystem.model.MessageResultV2;
-import com.qy.worksheetsystem.service.PersonWorkService;
-import com.qy.worksheetsystem.service.WorkCalendarService;
-import com.qy.worksheetsystem.util.DateUtil;
 import com.qy.worksheetsystem.util.JWTUtil;
 import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
 import io.swagger.annotations.Api;
@@ -13,18 +9,12 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 @RestController
 @RequestMapping("/work/personwork")
 @Api(value = "工时填报",tags="工时填报")
 public class PersonWorkController {
-    @Autowired
-    private PersonWorkService personWorkService;
 
     @ApiOperation(value = "获取可填报日期的已填报小时数", notes = "获取可填报日期的已填报小时数，判断每天填报是否超8小时")
     @RequestMapping(value = "/getAvailableDateInfo", method = RequestMethod.GET)
@@ -38,16 +28,8 @@ public class PersonWorkController {
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
-        int isValid = DateUtil.isValidDate(beginTime, endTime);
 
-        if (isValid== 1) {
-            return MessageResultV2.error("请输入正确的日期时间，日期格式例如2022-01-01");
-        }else if (isValid== 2){
-            return MessageResultV2.error("开始时间不能大于结束时间");
-        }
-        MessageResultV2 result = MessageResultV2.success();
-        result.setData(personWorkService.getAvailableDateInfo(number,beginTime,endTime));
-        return result;
+        return MessageResult.success();
     }
 
     @ApiOperation(value = "报工新增", notes = "报工新增")

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/WorkCalendarController.java

@@ -2,14 +2,13 @@ package com.qy.worksheetsystem.controller;
 
 import com.qy.worksheetsystem.model.MessageResult;
 import com.qy.worksheetsystem.model.MessageResultV2;
-import com.qy.worksheetsystem.service.WorkCalendarService;
-import com.qy.worksheetsystem.service.YunzhijiaService;
 import com.qy.worksheetsystem.util.DateUtil;
 import com.qy.worksheetsystem.util.JWTUtil;
-import com.qy.worksheetsystem.vo.WorkCalendarVo;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,9 +34,6 @@ import java.util.Map;
 @Api(value = "工作日历",tags="工作日历")
 public class WorkCalendarController {
 
-    @Autowired
-    private WorkCalendarService workCalendarService;
-
     @ApiOperation(value = "获取工作日历")
     @GetMapping("/getWorkCalendar")
     @ApiImplicitParams({
@@ -45,24 +41,29 @@ public class WorkCalendarController {
             @ApiImplicitParam(name="startDate",value="开始日期",required=true,paramType="query",dataType="String"),
             @ApiImplicitParam(name="endDate",value="结束日期",required=true,paramType="query",dataType="String"),
     })
-
     public MessageResult getWorkCalendar(@RequestHeader("token") String token, String startDate, String endDate) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if(StringUtils.isEmpty(number)){
-            return MessageResultV2.error("token异常");
+            return MessageResult.error("token异常");
+        }
+        if (DateUtil.isValidDate(startDate, endDate) == false) {
+            return MessageResult.error("请输入正确的日期时间，日期格式例如2022-01-01");
         }
-        int isValid = DateUtil.isValidDate(startDate, endDate);
 
-        if (isValid== 1) {
-            return MessageResultV2.error("请输入正确的日期时间，日期格式例如2022-01-01");
-        }else if (isValid== 2){
-            return MessageResultV2.error("开始时间不能大于结束时间");
+        Date start = sdf.parse(startDate);
+        Date end = sdf.parse(endDate);
+
+        if (start.getTime() > end.getTime()) {
+            return MessageResult.error("开始时间不能大于结束时间");
         }
 
-        List<WorkCalendarVo> list = workCalendarService.getWorkCalendar(startDate,endDate);
-        MessageResultV2<List<WorkCalendarVo>> messageResult= MessageResultV2.success();
-        messageResult.setData(list);
+        Map<String, String> map = new HashMap<>();
+        map.put("startDate", startDate);
+        map.put("endDate", endDate);
+
+        MessageResultV2 messageResult= MessageResultV2.success();
+        messageResult.setData(map);
         return messageResult;
     }
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/controller/YunzhijiaController.java

@@ -51,7 +51,7 @@ public class YunzhijiaController {
     @ApiOperation(value = "获取Token", notes = "获取Token")
     @RequestMapping(value ="/getToken",method = RequestMethod.GET)
     public MessageResult getToken(@RequestParam("personNum")String personNum, @RequestParam("userId")String userId){
-        String token = JWTUtil.createToken(personNum,userId,200000);
+        String token = JWTUtil.createToken(personNum,userId,20);
         MessageResultV2 messageResult= MessageResultV2.success();
         messageResult.setData(token);
         return messageResult;

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/MessageResult.java

@@ -1,7 +1,5 @@
 package com.qy.worksheetsystem.model;
 
-import lombok.Data;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,7 +8,6 @@ import java.util.Map;
  * @date 2022/2/28
  * @description  用于返回前端json数据的工具类
  */
-@Data
 public class MessageResult {
 
     // 状态码
@@ -47,17 +44,6 @@ public class MessageResult {
         return result;
     }
 
-    /**
-     * 认证失败
-     * @param msg
-     * @return
-     */
-    public static MessageResult noPermission(String msg) {
-        MessageResult result = new MessageResult();
-        result.setCode(401);
-        result.setMsg(msg);
-        return result;
-    }
     public static MessageResult error() {
         MessageResult result = new MessageResult();
         result.setCode(500);

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/PersonMapper.java

@@ -1,6 +1,5 @@
 package com.qy.worksheetsystem.model.mapper;
 
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -15,11 +14,11 @@ import java.util.Map;
  */
 @Repository
 public interface PersonMapper {
-     @MapKey("getPersonByUserId")
+
      Map<String,String> getPersonByUserId(@Param("userid")String userid);
-     @MapKey("getPersonByOpenId")
+
      Map<String,String> getPersonByOpenId(@Param("openid")String openid);
-     @MapKey("getPersonByJobNo")
+
      Map<String,String> getPersonByJobNo(@Param("jobNo")String jobNo);
 
 

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/PersonWorkMapper.java

@@ -1,14 +0,0 @@
-package com.qy.worksheetsystem.model.mapper;
-
-import org.apache.ibatis.annotations.MapKey;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Repository
-public interface PersonWorkMapper {
-        @MapKey("getAvailableDateInfo")
-        List<Map<String,Object>> getAvailableDateInfo(@Param("employeeID") String employeeID, @Param("startDate")String startDate,  @Param("endDate")String endDate);
-}

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/PersonWorkMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qy.worksheetsystem.model.mapper.PersonWorkMapper">
-
-    <select id="getAvailableDateInfo" resultType="java.util.Map">
-        select hre.CFEmployeeID, CONVERT(varchar(10) , hre.CFdata, 120),
-        isnull(CAST(sum(hre.CFWorkingHours) as decimal(20,2)),0)  workHours
-        from CT_PRO_WorkHoursReportEntry hre
-        where hre.CFEmployeeID=#{employeeID}
-        and hre.CFdata BETWEEN #{startDate}
-        AND #{endDate}
-        group by hre.CFData,hre.CFEmployeeID
-    </select>
-
-
-
-</mapper>

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/WorkCalendarMapper.java

@@ -1,6 +1,5 @@
 package com.qy.worksheetsystem.model.mapper;
 
-import com.qy.worksheetsystem.vo.WorkCalendarVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Repository;
@@ -11,5 +10,5 @@ import java.util.Map;
 @Repository
 public interface WorkCalendarMapper {
 
-    public List<WorkCalendarVo> getWorkCalendar(@Param("startDate")String startDate, @Param("endDate")String endDate);
+    public List<Map<String, String>> getWorkCalendar(@Param("startDate")String startDate, @Param("endDate")String endDate);
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/mapper/WorkCalendarMapper.xml

@@ -2,20 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qy.worksheetsystem.model.mapper.WorkCalendarMapper">
 
-    <select id="getWorkCalendar" resultType="com.qy.worksheetsystem.vo.WorkCalendarVo">
-        SELECT
-        item.fid as "id",
-        CONVERT(varchar(10) , item.FDate, 120 ) as "date",
-        CAST (item.FDayType as varchar) as "dateType",
-        item.FWEEK "week"
-        FROM
-        T_HR_ATS_WorkCalendarItem item
-        left join T_HR_ATS_WorkCalendar w on w.fid=item.FCALENDARGROUPID
-        WHERE
-        item.FDate BETWEEN #{startDate}
-        AND #{endDate}
-        AND w.FISDEFAULT=1
-        order by item.FDate
+    <select id="getWorkCalendar" resultType="java.util.Map">
+        select p.*
+        from t_bd_person p
+                 left join t_pm_user pp on pp.fpersonid=p.fid
+        where pp.fid=#{userid}
     </select>
 
 

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/PersonWorkService.java

@@ -6,7 +6,6 @@ import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
 import java.util.Map;
 
 
@@ -15,5 +14,4 @@ public interface PersonWorkService {
     @Transactional
     public Map<String,Object> insertWork(String number , InsertJobWorkingVO jobWork);
 
-    public List<Map<String, Object>> getAvailableDateInfo(String number, String startDate, String endDate);
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/WorkCalendarService.java

@@ -1,11 +1,9 @@
 package com.qy.worksheetsystem.service;
 
-import com.qy.worksheetsystem.vo.WorkCalendarVo;
-
 import java.util.List;
 import java.util.Map;
 
 public interface WorkCalendarService {
 
-    public List<WorkCalendarVo> getWorkCalendar(String startDate, String endDate);
+    public List<Map<String, String>> getWorkCalendar(String startDate, String endDate);
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/impl/PersonWorkServiceImpl.java

@@ -1,18 +1,11 @@
 package com.qy.worksheetsystem.service.impl;
 
-import com.qy.worksheetsystem.model.mapper.PersonMapper;
-import com.qy.worksheetsystem.model.mapper.PersonWorkMapper;
-
-import com.qy.worksheetsystem.service.PersonService;
 import com.qy.worksheetsystem.service.PersonWorkService;
 import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,28 +19,11 @@ import java.util.Map;
 @Slf4j
 @Service
 public class PersonWorkServiceImpl implements PersonWorkService {
-    private static final BigDecimal h8 = new BigDecimal(8);
-    @Resource
-    private PersonWorkMapper personWorkMapper;
-    @Resource
-    private PersonService personService;
+
     @Override
     @Transactional
     public Map<String,Object> insertWork(String number , InsertJobWorkingVO jobWork){
 
         return null;
     }
-
-    @Override
-    public List<Map<String, Object>> getAvailableDateInfo(String number, String startDate, String endDate) {
-        Map<String,String> person = personService.getPersonByJobNo(number);
-        List<Map<String,Object>> list = personWorkMapper.getAvailableDateInfo(person.get("fid"),startDate,endDate);
-        for(Map<String,Object> map : list){
-            BigDecimal workHours = (BigDecimal) map.get("workHours");
-            map.put("availableWorkHous",h8.subtract(workHours));
-        }
-        return list;
-    }
-
-
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/service/impl/WorkCalendarServiceImpl.java

@@ -2,7 +2,6 @@ package com.qy.worksheetsystem.service.impl;
 
 import com.qy.worksheetsystem.model.mapper.WorkCalendarMapper;
 import com.qy.worksheetsystem.service.WorkCalendarService;
-import com.qy.worksheetsystem.vo.WorkCalendarVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -28,12 +27,23 @@ public class WorkCalendarServiceImpl implements WorkCalendarService {
     @Resource
     private WorkCalendarMapper workCalendarMapper;
     @Override
-    public List<WorkCalendarVo> getWorkCalendar(String startDate,String endDate) {
+    public List<Map<String, String>> getWorkCalendar(String startDate,String endDate) {
         //0:工作日
         //1：休息日
         //2：法定假日
-        List<WorkCalendarVo> selectWorkCalendar=workCalendarMapper.getWorkCalendar(startDate,endDate);
+        List<Map<String, String>> selectWorkCalendar=workCalendarMapper.getWorkCalendar(startDate,endDate);
+        List<Map<String, String>> mapList = new ArrayList<>();
 
-        return selectWorkCalendar;
+        for (int i = 0; i < selectWorkCalendar.size(); i++) {
+            Map<String, String> maps = new HashMap<>();
+            Map<String, String> stringStringMap = selectWorkCalendar.get(i);
+
+            String strDate = stringStringMap.get("FDate");
+            String date = strDate.substring(0, 10);
+            maps.put("date", date);
+            maps.put("dateType", stringStringMap.get("dateType"));
+            mapList.add(maps);
+        }
+        return mapList;
     }
 }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/util/DateUtil.java

@@ -2,27 +2,21 @@ package com.qy.worksheetsystem.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 
 public class DateUtil {
-    public static int isValidDate(String startTime, String endTime) {
-        int convertSuccess = 0;
+    public static boolean isValidDate(String startTime, String endTime) {
+        boolean convertSuccess = true;
         // 指定日期格式为四位年/两位月份/两位日期，注意yyyy/MM/dd区分大小写；
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Date sTime=null;
-        Date eTime=null;
         try {
             // 设置lenient为false. 否则SimpleDateFormat会比较宽松地验证日期，比如2007/02/29会被接受，并转换成2007/03/01
             format.setLenient(false);
-            sTime= format.parse(startTime);
-            eTime= format.parse(endTime);
-            if (sTime.getTime() > eTime.getTime()) {
-                convertSuccess=2;
-            }
+            format.parse(startTime);
+            format.parse(endTime);
         } catch (ParseException e) {
             // e.printStackTrace();
             // 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
-            convertSuccess = 1;
+            convertSuccess = false;
         }
         return convertSuccess;
     }

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/vo/WorkCalendarVo.java

@@ -1,18 +0,0 @@
-package com.qy.worksheetsystem.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-@Data
-public class WorkCalendarVo {
-
-    private String id;
-
-    private String date;
-
-    private String dateType;
-
-    private String week;
-}

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/vo/WorkHoursReport.java

@@ -1,22 +0,0 @@
-package com.qy.worksheetsystem.vo;
-
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class WorkHoursReport {
-
-    private String dataSource;
-
-    private String affiliatedProject;
-
-    private String fillingStartDate;
-
-    private String fillingEndDate;
-
-    Map<String,Object> exData;
-
-    List<WorkHoursReportEntry> entrys;
-}

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/vo/WorkHoursReportEntry.java

@@ -1,26 +0,0 @@
-package com.qy.worksheetsystem.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-@Data
-public class WorkHoursReportEntry {
-
-    private String employee;
-
-    private String clockTime;
-
-    private String clockLocation;
-
-    private Date data;
-
-    private BigDecimal WorkingHours;
-
-    private String notes;
-
-    private String projectPerson;
-
-
-
-}