提交

app/workSheetSystem/pom.xml

@@ -8,7 +8,7 @@
         <version>2.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <groupId>com.qy</groupId>
     <artifactId>workSheetSystem</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -104,18 +104,23 @@
           <dependency>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-starter-web</artifactId>
-             
+              <exclusions>
+                  <exclusion>
+                      <groupId>org.springframework.boot</groupId>
+                      <artifactId>spring-boot-starter-tomcat</artifactId>
+                  </exclusion>
+              </exclusions>
           </dependency>
         <!--  <dependency>
              <groupId>org.springframework.boot</groupId>
              <artifactId>spring-boot-starter-tomcat</artifactId>
              <scope>provided</scope>
-         </dependency>
+         </dependency>-->
          <dependency>
              <groupId>org.springframework.boot</groupId>
              <artifactId>spring-boot-starter-undertow</artifactId>
             <scope>provided</scope>
-         </dependency>-->
+         </dependency>
 
          <dependency>
              <groupId>org.mybatis.spring.boot</groupId>

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

@@ -4,6 +4,7 @@ import com.google.common.collect.Maps;
 import com.qy.worksheetsystem.model.MessageResult;
 
 import com.qy.worksheetsystem.model.MessageResultV2;
+import com.qy.worksheetsystem.model.entity.JobBooking;
 import com.qy.worksheetsystem.service.PersonService;
 import com.qy.worksheetsystem.service.PersonWorkService;
 import com.qy.worksheetsystem.service.WorkCalendarService;
@@ -220,6 +221,7 @@ public class PersonWorkController {
         //result.setData(list);
         return result;
     }
+
     @ApiOperation(value = "获取员工报工明细", notes = "获取员工报工明细")
     @RequestMapping(value = "/getPersonWorkInfoById", method = RequestMethod.GET)
     @ApiImplicitParams({
@@ -227,15 +229,16 @@ public class PersonWorkController {
             @ApiImplicitParam(name = "id", value = "报工id", required = true, paramType = "query", dataType = "String"),
     })
     public MessageResult getPersonWorkInfoById(@RequestHeader("token") String token, String id) {
-        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);
+        JobBooking list = personWorkService.getPersonWorkInfoById(number,id);
         MessageResultV2 result=MessageResultV2.success();
-       // result.setData(list);
+        result.setData(list);
         return result;
     }
+
     @ApiOperation(value = "提交工作流", notes = "提交工作流")
     @RequestMapping(value = "/subWork", method = RequestMethod.GET)
     @ApiImplicitParams({

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+@Slf4j
 @RestController
 @RequestMapping("/work/project/")
 @Api(value = "项目管理、项目人员管理", tags = "项目管理、项目人员管理")
@@ -189,14 +190,14 @@ public class ProjectController {
         Map<String, String> projectManagementMap = projectPersonService.getProjectManagementInfoBYId(projectID);
         String projectName = projectManagementMap.get("projectName");
         String projectNumber = projectManagementMap.get("number");
-        System.out.println("projectManagementMap----" + mapper.writeValueAsString(projectManagementMap));
+        log.error("projectManagementMap----" + mapper.writeValueAsString(projectManagementMap));
         mapParam.put("projectName", projectName);
         mapParam.put("projectNumber", projectNumber);
         String billNumber = projectNumber + number;
         mapParam.put("number", billNumber);
         List<Map<String, String>> managementByNumber = projectPersonService.getManagementByNumber(billNumber);
         String mapvalue = mapper.writeValueAsString(mapParam);
-        System.out.println("mapvalue----" + mapvalue);
+        log.error("mapvalue----" + mapvalue);
         Map map = new HashMap();
         if (managementByNumber.size() <= 0) {
             map = projectPersonService.addProjectPerson(mapParam);

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/entity/JobBookPerson.java

@@ -0,0 +1,11 @@
+package com.qy.worksheetsystem.model.entity;
+
+import lombok.Data;
+
+@Data
+public class JobBookPerson {
+    private String personId;
+    private String personName;
+    private String personNumber;
+
+}

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/entity/JobBooking.java

@@ -0,0 +1,19 @@
+package com.qy.worksheetsystem.model.entity;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class JobBooking {
+    private String id;
+
+    private String beginTime;
+    private String endTime;
+    private String state;
+    private String projectName;
+    private String projectId;
+    private JobBookPerson person;
+    private List<JobBookingEntry> entries;
+}

app/workSheetSystem/src/main/java/com/qy/worksheetsystem/model/entity/JobBookingEntry.java

@@ -0,0 +1,12 @@
+package com.qy.worksheetsystem.model.entity;
+
+import lombok.Data;
+
+@Data
+public class JobBookingEntry {
+    private String entryId;
+    private String seq;
+    private String notes;
+    private String workingHours;
+    private String workingDate;
+}

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

@@ -1,5 +1,6 @@
 package com.qy.worksheetsystem.model.mapper;
 
+import com.qy.worksheetsystem.model.entity.JobBooking;
 import org.apache.ibatis.annotations.MapKey;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -21,7 +22,7 @@ public interface PersonWorkMapper {
         List<Map<String,Object>> getPersonWorkList(String number,String beginTime, String endTime, Boolean state);
 
         List<Map<String,Object>> getPersonWorkSumInfo(String number,String beginTime, String endTime, Boolean state);
-        List<Map<String,Object>> getPersonWorkInfoById(String number,String id);
+        JobBooking getPersonWorkInfoById(String number,String id);
 
         int deleteWork(String id);
         int deleteWorkEntry(String id);

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

@@ -42,10 +42,10 @@
         and  hre.CfData BETWEEN to_date(#{beginTime},'YYYY-MM-DD')
         AND  to_date(#{endTime},'YYYY-MM-DD')
         <if test="state==true">
-            and whr.fbillState=2
+            and whr.fbillState!=0
         </if>
         <if test="state==false">
-            and whr.fbillState=1
+            and whr.fbillState=0
         </if>
     </select>
     <select id="getPersonWorkSumInfo" resultType="java.util.Map">
@@ -58,10 +58,10 @@
         and  hre.CfData BETWEEN to_date(#{beginTime},'YYYY-MM-DD')
         AND  to_date(#{endTime},'YYYY-MM-DD')
         <if test="state==true">
-            and whr.fbillState=2
+            and whr.fbillState!=0
         </if>
         <if test="state==false">
-            and whr.fbillState=1
+            and whr.fbillState=0
         </if>
         group by whr.fbillState
     </select>
@@ -99,22 +99,40 @@
             FROM dual
         </foreach>
     </insert>
-    <select id="getPersonWorkInfoById" resultType="java.util.Map">
-        select whr.fbillState "state",sum(hre.CFWorkingHours) "WorkingHours"
-        from CT_PRO_WorkHoursReportEntry hre
+    <resultMap id="JobBookingEntry" type="com.qy.worksheetsystem.model.entity.JobBooking" >
+        <id column="id" property="id"/>
+        <result column="startDate" property="beginTime"/>
+        <result column="endDate" property="endTime"/>
+        <result column="state" property="state"/>
+        <result column="projectName" property="projectName"/>
+        <result column="projectId" property="projectId"/>
+        <association property="person" javaType="com.qy.worksheetsystem.model.entity.JobBookPerson">
+            <id property="personId" column="personId" />
+            <result column="personName" property="personName" />
+            <result column="personNumber" property="personNumber" />
+        </association>
+        <collection property="entries" ofType="com.qy.worksheetsystem.model.entity.JobBookingEntry">
+            <id column="entryId" property="entryId"/>
+            <result column="seq" property="seq"/>
+            <result column="notes" property="notes"/>
+            <result column="workingHours" property="workingHours"/>
+            <result column="workingDate" property="workingDate"/>
+        </collection>
+    </resultMap>
+    <select id="getPersonWorkInfoById" resultMap="JobBookingEntry">
+        select whr.fid "id",whr.CFFILLINGSTARTDATE "startDate",
+        whr.CFFILLINGENDDATE "endDate" , whr.FBILLSTATE "state",
+        p.fid "personId",p.fname_l2 "personName",p.fnumber "personNumber",
+        pm.CFPROJECTNAME "projectName",pm.fid "projectId",
+        hre.CFDATA "workingDate",hre.CFWORKINGHOURS "workingHours",
+        hre.CFNOTES "notes",hre.FSEQ "seq",
+        hre.fid "entryId"
+        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
         left join t_bd_person p on hre.CFEmployeeID=p.FID
-        where p.fnumber=#{number}
-        and  hre.CfData BETWEEN to_date(#{beginTime},'YYYY-MM-DD')
-        AND  to_date(#{endTime},'YYYY-MM-DD')
-        <if test="state==true">
-            and whr.fbillState=2
-        </if>
-        <if test="state==false">
-            and whr.fbillState=1
-        </if>
-        group by whr.fbillState
+        where whr.fid =#{id}
     </select>
     <delete id="deleteWork" parameterType="String">
         delete CT_PRO_WorkHoursReport where fid =#{id}

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

@@ -1,7 +1,7 @@
 <?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.ProjectMapper">
-    <insert id="addProjectPerson">
+    <insert id="addProjectPerson" parameterType="java.util.Map">
         insert into
         CT_PRO_MemberManagement(fid,CFEmployeeID,CFPROJECTMANAGEMENID,
                                 CFProjectRoleID,FCreatorID,FLastUpdateUserID,

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

@@ -1,6 +1,7 @@
 package com.qy.worksheetsystem.service;
 
 import com.qy.worksheetsystem.model.MessageResult;
+import com.qy.worksheetsystem.model.entity.JobBooking;
 import com.qy.worksheetsystem.util.JWTUtil;
 import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
 import org.apache.commons.lang3.StringUtils;
@@ -19,7 +20,7 @@ public interface PersonWorkService {
     List<Map<String,Object>> getPersonWorkList(String number,String beginTime, String endTime, Boolean state);
     List<Map<String,Object>> getPersonWorkSumInfo(String number,String beginTime, String endTime, Boolean state);
 
-    List<Map<String,Object>> getPersonWorkInfoById(String number, String id);
+    JobBooking getPersonWorkInfoById(String number, String id);
 
     @Transactional
     int deleteWork(String number, String id);

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

@@ -3,6 +3,7 @@ package com.qy.worksheetsystem.service.impl;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.qy.worksheetsystem.model.entity.JobBooking;
 import com.qy.worksheetsystem.model.mapper.PersonWorkMapper;
 
 import com.qy.worksheetsystem.model.mapper.ProjectMapper;
@@ -78,7 +79,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", Integer.parseInt(jobWork.getState())-1);
                 billMap.put("number", number);
                 billMap.put("CU", person.get("controlUnitID"));
                 Date createTime = new Date();
@@ -152,9 +153,9 @@ public class PersonWorkServiceImpl implements PersonWorkService {
         return list;
     }
     @Override
-    public List<Map<String,Object>> getPersonWorkInfoById(String number, String id){
-        List<Map<String,Object>> list =personWorkMapper.getPersonWorkInfoById( number, id);
-        return list;
+    public JobBooking getPersonWorkInfoById(String number, String id){
+        JobBooking e =personWorkMapper.getPersonWorkInfoById( number, id);
+        return e;
     }
     @Override
     @Transactional

app/workSheetSystem/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
     <!-- debug     :当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
     <!-- ================================================= 定义变量 ================================================= -->
     <!-- name的值是变量的名称，value的值时变量定义的值。定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="C:\logs" />
+    <property name="log.path" value="logs" />
     <!--    <property name="log.path" value="logs"/>-->
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->