Merge branch 'master' of http://47.92.104.23:3000/project/hongtaiyang

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

@@ -189,7 +189,7 @@ public class PersonWorkController {
         result.add("datalist",list);
         return result;
     }
-    @ApiOperation(value = "获取员工汇总信息", notes = "获取员工汇总信息")
+    @ApiOperation(value = "更新", notes = "更新")
     @RequestMapping(value = "/update", method = RequestMethod.GET)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@@ -199,7 +199,23 @@ public class PersonWorkController {
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
-        //List<Map<String,Object>> list = personWorkService.getPersonWorkSumInfo(number,beginTime,endTime,state);
+        //List<Map<String,Object>> list = personWorkService.getPersonWorkInfoById(number,id);
+        MessageResultV2 result=MessageResultV2.success();
+        //result.setData(list);
+        return result;
+    }
+    @ApiOperation(value = "删除报工", notes = "删除报工")
+    @RequestMapping(value = "/deleteWork", method = RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+            @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);
+        if (StringUtils.isEmpty(number)) {
+            return MessageResult.error("token异常");
+        }
+         int i = personWorkService.deleteWork(number,id);
         MessageResultV2 result=MessageResultV2.success();
         //result.setData(list);
         return result;
@@ -208,16 +224,33 @@ public class PersonWorkController {
     @RequestMapping(value = "/getPersonWorkInfoById", method = RequestMethod.GET)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
-            @ApiImplicitParam(name = "id", value = "报工", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "id", value = "报工id", required = true, paramType = "query", dataType = "String"),
     })
-    public MessageResult getPersonWorkInfoById(@RequestHeader("token") String token, String beginTime,String endTime,Boolean state) {
+    public MessageResult getPersonWorkInfoById(@RequestHeader("token") String token, String id) {
         String number = JWTUtil.getCacheNumber(token);
         if (StringUtils.isEmpty(number)) {
             return MessageResult.error("token异常");
         }
-        //List<Map<String,Object>> list = personWorkService.getPersonWorkInfoById(number,beginTime,endTime,state);
+        List<Map<String,Object>> list = personWorkService.getPersonWorkInfoById(number,id);
         MessageResultV2 result=MessageResultV2.success();
        // result.setData(list);
         return result;
     }
+    @ApiOperation(value = "提交工作流", notes = "提交工作流")
+    @RequestMapping(value = "/subWork", method = RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+            @ApiImplicitParam(name = "id", value = "报工id", required = true, paramType = "query", dataType = "String"),
+    })
+    public MessageResult submitWork(@RequestHeader("token") String token, String id) {
+        String number = JWTUtil.getCacheNumber(token);
+        if (StringUtils.isEmpty(number)) {
+            return MessageResult.error("token异常");
+        }
+        int i = personWorkService.submitWork(number,id);
+        MessageResultV2 result=MessageResultV2.success();
+        // result.setData(list);
+        return result;
+    }
+
 }

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

@@ -21,4 +21,8 @@ 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);
+
+        int deleteWork(String id);
+        int deleteWorkEntry(String id);
 }

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

@@ -11,7 +11,7 @@
         SELECT
         item.fid as "id",
         TO_CHAR(NVL( item.FDate, ''), 'YYYY-MM-DD')  "date",
-        TO_CHAR(item.FDayType) as "dateType",
+        (item.FDayType) as "dateType",
         item.FWEEK "week",hre.CFEmployeeID "employeeID",hre.workHours as "workHours"
         FROM
         T_HR_ATS_WorkCalendarItem item
@@ -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=1
+            and whr.fbillState=2
         </if>
         <if test="state==false">
-            and whr.fbillState=0
+            and whr.fbillState=1
         </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=1
+            and whr.fbillState=2
         </if>
         <if test="state==false">
-            and whr.fbillState=0
+            and whr.fbillState=1
         </if>
         group by whr.fbillState
     </select>
@@ -98,7 +98,29 @@
             #{item.seq}, newbosid('22DCD041')
             FROM dual
         </foreach>
-
     </insert>
+    <select id="getPersonWorkInfoById" resultType="java.util.Map">
+        select whr.fbillState "state",sum(hre.CFWorkingHours) "WorkingHours"
+        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
+    </select>
+    <delete id="deleteWork" parameterType="String">
+        delete CT_PRO_WorkHoursReport where fid =#{id}
+    </delete>
+    <delete id="deleteWorkEntry" parameterType="String">
+        delete CT_PRO_WorkHoursReportEntry where FPARENTID =#{id}
+    </delete>
 
 </mapper>

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

@@ -6,7 +6,7 @@
         SELECT
         item.fid as "id",
         to_char(item.FDate, 'YYYY-MM-DD') as "date",
-        to_char (item.FDayType) as "dateType",
+         (item.FDayType) as "dateType",
         item.FWEEK "week"
         FROM
         T_HR_ATS_WorkCalendarItem item

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

@@ -18,4 +18,12 @@ public interface PersonWorkService {
     public List<Map<String, Object>> getAvailableDateInfo(String number, String startDate, String endDate);
     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);
+
+    @Transactional
+    int deleteWork(String number, String id);
+
+    @Transactional
+    int submitWork(String number, String id);
 }

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

@@ -1,26 +1,19 @@
 package com.qy.worksheetsystem.service.impl;
 
 
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.qy.worksheetsystem.model.MessageResult;
-import com.qy.worksheetsystem.model.mapper.PersonMapper;
 import com.qy.worksheetsystem.model.mapper.PersonWorkMapper;
 
 import com.qy.worksheetsystem.model.mapper.ProjectMapper;
 import com.qy.worksheetsystem.service.PersonService;
 import com.qy.worksheetsystem.service.PersonWorkService;
 import com.qy.worksheetsystem.util.SnowflakeUtils;
-import com.qy.worksheetsystem.vo.InsertJobWorkingVO;
 import com.qy.worksheetsystem.vo.WorkHoursReport;
 import com.qy.worksheetsystem.vo.WorkHoursReportEntry;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -111,7 +104,7 @@ public class PersonWorkServiceImpl implements PersonWorkService {
                     objectMap.put("clockTime", reportDate);
                     objectMap.put("clockLocation", "移动端");
                     objectMap.put("data", format.parse(reportDate));
-                    objectMap.put("WorkingHours", availableWorkHous);
+                    objectMap.put("WorkingHours", Hour);
                     objectMap.put("notes", "");
                     objectMap.put("seq", i);
                     workList.add(objectMap);
@@ -153,10 +146,28 @@ public class PersonWorkServiceImpl implements PersonWorkService {
         List<Map<String,Object>> list = personWorkMapper.getPersonWorkList(number,beginTime,endTime,state);
         return list;
     }
-
+    @Override
     public List<Map<String,Object>> getPersonWorkSumInfo(String number,String beginTime,String endTime,Boolean state){
         List<Map<String,Object>> list =personWorkMapper.getPersonWorkSumInfo(number,beginTime,endTime,state);
         return list;
     }
+    @Override
+    public List<Map<String,Object>> getPersonWorkInfoById(String number, String id){
+        List<Map<String,Object>> list =personWorkMapper.getPersonWorkInfoById( number, id);
+        return list;
+    }
+    @Override
+    @Transactional
+    public int deleteWork(String number, String id){
+        int x =personWorkMapper.deleteWorkEntry(id);
+        int i =personWorkMapper.deleteWork(id);
+        return i;
+    }
+    @Override
+    @Transactional
+    public int submitWork(String number, String id){
+
+        return 0;
+    }
 
 }

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

@@ -10,5 +10,6 @@ public class WorkHoursReport {
     private String beginTime;
     private String endTime;
     private String state;
+    private String id;
     private List<WorkHoursReportEntry> entries;
 }

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

@@ -9,4 +9,5 @@ public class WorkHoursReportEntry {
     private String workingHours;
     private String projectId;
     private String projectName;
+
 }

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="logs" />
+    <property name="log.path" value="C:\logs" />
     <!--    <property name="log.path" value="logs"/>-->
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->