修改token认证

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

@@ -1,5 +1,6 @@
 package com.qy.worksheetsystem.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Maps;
 import com.qy.worksheetsystem.model.MessageResult;
 
@@ -46,7 +47,7 @@ public class PersonWorkController {
             @ApiImplicitParam(name = "endTime", value = "开始时间yyyy-MM-dd", required = true, paramType = "query", dataType = "String"),
     })
     public MessageResult getAvailableDateInfo(@RequestHeader("token") String token, String beginTime,String endTime) {
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -77,6 +78,13 @@ public class PersonWorkController {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             String beginTime = jobWork.getBeginTime();
             String endTime = jobWork.getEndTime();
+            if (StrUtil.isBlank(beginTime)) {
+                return MessageResultV2.error("开始时间结束时间不能为空");
+            }
+            if ( StrUtil.isBlank(endTime)) {
+                return MessageResultV2.error("结束始时间结束时间不能为空");
+            }
+
             Integer Hours = 0;
             //获取员工信息
             Map<String, String> person = personService.getPersonByJobNo(number);
@@ -146,6 +154,13 @@ public class PersonWorkController {
                 return result;
             }
             Map<String,Object> objectMap = personWorkService.insertWork(map);
+            if("2".equals(jobWork.getState())){
+                List<Map<String, Object>> billList = (List<Map<String, Object>>) objectMap.get("billList");
+                for(Map<String, Object> stringObjectMap:billList) {
+                    String id = (String) stringObjectMap.get("id");
+                    int i = personWorkService.submitWork(number, id);
+                }
+            }
             MessageResultV2 resultV2 = MessageResultV2.success();
             resultV2.setData(objectMap);
             return resultV2;
@@ -181,7 +196,7 @@ public class PersonWorkController {
             @ApiImplicitParam(name = "endTime", value = "开始时间yyyy-MM-dd", required = true, paramType = "query", dataType = "String"),
     })
     public MessageResult getPersonWorkSumInfo(@RequestHeader("token") String token, String beginTime,String endTime,Boolean state) {
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -196,13 +211,12 @@ public class PersonWorkController {
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
     })
     public MessageResult update(@RequestHeader("token") String token, @RequestBody WorkHoursReport jobWork) {
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
-        //List<Map<String,Object>> list = personWorkService.getPersonWorkInfoById(number,id);
-        MessageResultV2 result=MessageResultV2.success();
-        //result.setData(list);
+        int i = personWorkService.deleteWork(number,jobWork.getId());
+        MessageResult result = this.insertWork(token,jobWork);
         return result;
     }
     @ApiOperation(value = "删除报工", notes = "删除报工")
@@ -212,7 +226,7 @@ public class PersonWorkController {
             @ApiImplicitParam(name = "id", value = "报工id", required = true, paramType = "query", dataType = "String"),
     })
     public MessageResult deleteWork(@RequestHeader("token") String token,  String id) {
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -247,7 +261,7 @@ public class PersonWorkController {
     })
     public MessageResult submitWork(@RequestHeader("token") String token, String id) {
         MessageResult result = MessageResult.success();
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -265,7 +279,7 @@ public class PersonWorkController {
     })
     public MessageResult revocaWork(@RequestHeader("token") String token, String id) {
         MessageResult result = MessageResult.success();
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }

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

@@ -46,7 +46,7 @@ public class ProjectController {
     public MessageResult getProjectList(@RequestHeader("token") String token, String state) {
         Map result = new HashMap();
 
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -78,7 +78,7 @@ public class ProjectController {
     })
     public MessageResult getProjectByTimeList(@RequestHeader("token") String token, String state) {
         Map result = new HashMap();
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -118,7 +118,7 @@ public class ProjectController {
     })
     public MessageResult getPersonListByProject(@RequestHeader("token") String token, String id) throws ParseException {
 
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -156,7 +156,7 @@ public class ProjectController {
         Boolean state = personVo.getState();
 
         Map resultMap = new HashMap();
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -245,7 +245,7 @@ public class ProjectController {
     })
     public MessageResult getPersonList(@RequestHeader("token") String token) {
 
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
@@ -263,7 +263,7 @@ public class ProjectController {
     })
     public MessageResult getProjectRoleList(@RequestHeader("token") String token) {
         Map result = new HashMap();
-        String number = JWTUtil.getCacheNumber(token);
+        String number = JWTUtil.getNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }

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

@@ -48,7 +48,7 @@ public class WorkCalendarController {
 
     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异常");
         }

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

@@ -33,7 +33,7 @@
         select p.fnumber "personNumber",p.fname_l2 "personName",
         whr.CFAffiliatedProjec "projectID", pm.CFProjectName "projectName",
         hre.CFClockTime "clockTime",to_char(hre.CfData,'YYYY-MM-DD') "data",hre.CFWorkingHours "WorkingHours",
-        whr.fbillState "state",hre.fid "id"
+        whr.fbillState "state",whr.fid "id"
         from CT_PRO_WorkHoursReportEntry hre
         left join CT_PRO_WorkHoursReport whr on whr.fid=hre.FParentID
         left join CT_PRO_ProjectManagement pm on pm.FID=whr.CFAffiliatedProjec

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

@@ -88,7 +88,7 @@ public class PersonWorkServiceImpl implements PersonWorkService {
                 billMap.put("fillingEndDate", endDate);
                 billMap.put("adminOrg", person.get("adminOrgId"));
                 billMap.put("hrOrgUnit", person.get("hrOrgUnitID"));
-                billMap.put("billState", jobWork.getState());
+                billMap.put("billState", "0");
                 billMap.put("number", number);
                 billMap.put("CU", person.get("controlUnitID"));
                 Date createTime = new Date();