修改

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

@@ -68,7 +68,7 @@ public class PersonWorkController {
     })
     public MessageResultV2 insertWork(@RequestHeader("token") String token, @RequestBody WorkHoursReport jobWork) {
         try {
-            String number = JWTUtil.getCacheNumber(token);
+            String number = JWTUtil.getNumber(token);
             if (StringUtils.isEmpty(number)) {
                 return MessageResultV2.error("token异常");
             }
@@ -127,7 +127,7 @@ public class PersonWorkController {
                     }
                     String reportDate = yearMonth + iday;
                     Map<String,Object> avMap = availableMap.get(reportDate);
-                    BigDecimal availableWorkHous = (BigDecimal) avMap.get("availableWorkHous");
+                    BigDecimal availableWorkHous = (BigDecimal) avMap.get("availableWorkHours");
                     BigDecimal workHours = (BigDecimal) avMap.get("workHours");
                     if(availableWorkHous.compareTo(Hour)<0){
                         errMsg.append("项目："+jobWorkEntry.getProjectName()+",日期："+reportDate+",已填报："+workHours.toPlainString()+"小时,不能再填报" + Hour.toPlainString() + "小时,一天的总填报小时数需小于等于8小时!");
@@ -163,13 +163,13 @@ public class PersonWorkController {
             @ApiImplicitParam(name = "state", value = "true已提交，false待提交", required = false, paramType = "query", dataType = "Boolean"),
     })
     public MessageResult getPersonWorkList(@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异常");
         }
         List<Map<String,Object>> list = personWorkService.getPersonWorkList(number,beginTime,endTime,state);
-        MessageResultV2 result=MessageResultV2.success();
-        result.setData(list);
+        MessageResult result=MessageResult.success();
+        result.add("datalist",list);
         return result;
     }
     @ApiOperation(value = "获取员工汇总信息", notes = "获取员工汇总信息")
@@ -185,8 +185,8 @@ public class PersonWorkController {
             return MessageResult.error("token异常");
         }
         List<Map<String,Object>> list = personWorkService.getPersonWorkSumInfo(number,beginTime,endTime,state);
-        MessageResultV2 result=MessageResultV2.success();
-        result.setData(list);
+        MessageResult result=MessageResult.success();
+        result.add("datalist",list);
         return result;
     }
     @ApiOperation(value = "获取员工汇总信息", notes = "获取员工汇总信息")

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

@@ -32,7 +32,7 @@
     <select id="getPersonWorkList" resultType="java.util.Map">
         select p.fnumber "personNumber",p.fname_l2 "personName",
         whr.CFAffiliatedProjec "projectID", pm.CFProjectName "projectName",
-        hre.CFClockTime "clockTime",hre.CfData "data",hre.CFWorkingHours "WorkingHours",
+        hre.CFClockTime "clockTime",to_char(hre.CfData,'YYYY-MM-DD') "data",hre.CFWorkingHours "WorkingHours",
         whr.fbillState "state",hre.fid "id"
         from CT_PRO_WorkHoursReportEntry hre
         left join CT_PRO_WorkHoursReport whr on whr.fid=hre.FParentID
@@ -41,7 +41,12 @@
         where p.fnumber=#{number}
         and  hre.CfData BETWEEN to_date(#{beginTime},'YYYY-MM-DD')
         AND  to_date(#{endTime},'YYYY-MM-DD')
-        and whr.fbillState=#{state}
+        <if test="state==true">
+            and whr.fbillState=1
+        </if>
+        <if test="state==false">
+            and whr.fbillState=0
+        </if>
     </select>
     <select id="getPersonWorkSumInfo" resultType="java.util.Map">
         select whr.fbillState "state",sum(hre.CFWorkingHours) "WorkingHours"
@@ -52,7 +57,12 @@
         where p.fnumber=#{number}
         and  hre.CfData BETWEEN to_date(#{beginTime},'YYYY-MM-DD')
         AND  to_date(#{endTime},'YYYY-MM-DD')
-        and whr.fbillState=#{state}
+        <if test="state==true">
+            and whr.fbillState=1
+        </if>
+        <if test="state==false">
+            and whr.fbillState=0
+        </if>
         group by whr.fbillState
     </select>
     <insert id="insertBill" parameterType="java.util.List" >
@@ -64,32 +74,31 @@
         FLastUpdateTime, FControlUnitID,FID,
         CFDataSource,CFFillingStartDate,CFFillingEndDate
         )
-        values
-        <foreach collection="billList" item="item" index="index" separator=",">
-        (
+        <foreach collection="billList" item="item" index="index" separator="UNION ALL">
+            SELECT
             #{item.affiliatedProject}, #{item.adminOrg}, #{item.hrOrgUnit},
             #{item.billState}, #{item.number}, #{item.bizDate},
             #{item.creator}, SYSDATE, #{item.lastUpdateUser},
             SYSDATE, #{item.CU}, #{item.id},
             'employeeReport', #{item.fillingStartDate}, #{item.fillingEndDate}
-        )
+            FROM dual
         </foreach>
+
     </insert>
+
     <insert id="insertWork" parameterType="java.util.List">
-        INSERT
-        into CT_PRO_WorkHoursReportEntry(FParentID,CFEmployeeID,CFClockTime,
+        INSERT into CT_PRO_WorkHoursReportEntry(FParentID,CFEmployeeID,CFClockTime,
         CFClockLocation,CFData,CFWorkingHours,
-        CFNotes,FSeq,Fid
-        )
-        values
-        <foreach collection="workList" item="item" index="index" separator=",">
-            (
+        CFNotes,FSeq,Fid)
+        <foreach collection="workList" item="item" index="index" separator="UNION ALL">
+            SELECT
             #{item.parent},#{item.employee},
-            #{item.clockTime},#{item.clockLocation},#{item.data},
+            #{item.clockTime},#{item.clockLocation},to_date(#{item.clockTime},'YYYY-MM-DD'),
             #{item.WorkingHours},#{item.notes},
             #{item.seq}, newbosid('22DCD041')
-            )
+            FROM dual
         </foreach>
+
     </insert>
 
 </mapper>

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

@@ -104,7 +104,7 @@ public class PersonWorkServiceImpl implements PersonWorkService {
                     }
                     String reportDate = yearMonth + iday;
                     Map<String, Object> avMap = availableMap.get(reportDate);
-                    BigDecimal availableWorkHous = (BigDecimal) avMap.get("availableWorkHous");
+                    BigDecimal availableWorkHous = (BigDecimal) avMap.get("availableWorkHours");
                     BigDecimal workHours = (BigDecimal) avMap.get("workHours");
                     objectMap.put("parent", billID);
                     objectMap.put("employee", person.get("id"));