工时详情

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/ManHourInfoApi.java

@@ -22,4 +22,5 @@ public interface ManHourInfoApi extends ApiMixin<ManHourInfoVo, Integer> {
 
     ResMsg deleteManHour(List<ManHourInfoVo> manHourInfoVos);
 
+    ResMsg findManHourByID(ManHourInfoVo manHourInfoVo);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/api/ManHourServiceApi.java

@@ -41,5 +41,10 @@ public class ManHourServiceApi implements ManHourInfoApi {
         return manHourService.deleteManHour(manHourInfoVos);
     }
 
+    @Override
+    public ResMsg findManHourByID(ManHourInfoVo manHourInfoVo) {
+        return manHourService.findManHourByID(manHourInfoVo.getManId());
+    }
+
 
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -233,7 +233,6 @@ public class CostInfoController {
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         String username = TokenData.takeFromRequest().getLoginName();
         //---查询到所有的任务量
-        final Integer pageNum = listRuntimeTaskRequestVo.getPageNum();
         listRuntimeTaskRequestVo.setPageNum(1);
         listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
@@ -258,7 +257,6 @@ public class CostInfoController {
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         String username = TokenData.takeFromRequest().getLoginName();
         //---查询到所有的任务量
-        final Integer pageNum = listRuntimeTaskRequestVo.getPageNum();
         listRuntimeTaskRequestVo.setPageNum(1);
         listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
@@ -280,7 +278,6 @@ public class CostInfoController {
     public ResMsg listRuntimeTaskByProjectAdd(
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         //---查询到所有的任务量
-        final Integer pageNum = listRuntimeTaskRequestVo.getPageNum();
         listRuntimeTaskRequestVo.setPageNum(1);
         listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(TokenData.takeFromRequest().getLoginName(), listRuntimeTaskRequestVo);
@@ -322,7 +319,6 @@ public class CostInfoController {
      */
     public ResMsg<JSONObject> viewUserTaskDatasource(
             String processInstanceId, String taskId) {
-        String errorMessage;
         // 验证流程任务的合法性。
         Task task = flowApiService.getProcessInstanceActiveTask(processInstanceId, taskId);
         ProcessInstance instance = flowApiService.getProcessInstance(processInstanceId);
@@ -448,7 +444,7 @@ public class CostInfoController {
                 break;
             case "人员工时":
                 //查询的任务分类是人员工时时，需要筛选人员工时的表单数据
-                byTaskAdd = flowTaskAssignmentByManhour(flowTaskVoListByQueryType, queryType);
+                byTaskAdd = flowTaskAssignmentByManHour(flowTaskVoListByQueryType, queryType);
                 projectIds = (Set<Integer>) byTaskAdd.get("projectIds");
                 processInstanceIds = (Set<String>) byTaskAdd.get("processInstanceIds");
                 flowTaskVoListByQueryType = (List<FlowTaskVo>) byTaskAdd.get("flowTaskVoListByQueryTypePro");
@@ -570,7 +566,7 @@ public class CostInfoController {
     }
 
     //查询的任务分类是工时申请时，需要筛选工时申请的表单数据
-    private Map<String, Object> flowTaskAssignmentByManhour(List<FlowTaskVo> flowTaskVoListByQueryTypePro, String queryType) {
+    private Map<String, Object> flowTaskAssignmentByManHour(List<FlowTaskVo> flowTaskVoListByQueryTypePro, String queryType) {
         Set<Integer> projectIds = new HashSet<>();
         Set<String> processInstanceIds = new HashSet<>();
         for (FlowTaskVo taskVo : flowTaskVoListByQueryTypePro) {

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/ManHourController.java

@@ -34,6 +34,14 @@ public class ManHourController {
         return manHourInfoApi.findManHourAll(manHourInfoVo);
     }
 
+    /**
+     * 工时详情
+     */
+    @RequestMapping("/findManHourByID")
+    public ResMsg findManHourByID(@RequestBody ManHourInfoVo manHourInfoVo) {
+        return manHourInfoApi.findManHourByID(manHourInfoVo);
+    }
+
     /**
      * 新建工时
      */

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/entity/ManHourInfoEntity.java

@@ -3,6 +3,7 @@ package com.ankaibei.workFlow.webadmin.ankaibei.entity;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -66,6 +67,21 @@ public class ManHourInfoEntity {
      */
     private String isDelete;
 
+    /**
+     * 工时信息
+     */
+
+    private List<ManHourJobInfo> manHourJob;
+
+    @Transient
+    public List<ManHourJobInfo> getManHourJob() {
+        return manHourJob;
+    }
+
+    public void setManHourJob(List<ManHourJobInfo> manJobs) {
+        this.manHourJob = manJobs;
+    }
+
     @Basic
     @Column(name = "is_delete")
     public String getIsDelete() {

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/ManHourService.java

@@ -21,4 +21,6 @@ public interface ManHourService {
     ResMsg addManHour(String projectId, ManHourInfoEntity manHourInfoEntity, List<ManHourJobInfo> manHours);
 
     ResMsg deleteManHour(List<ManHourInfoVo> manHourInfoVos);
+
+    ResMsg findManHourByID(Integer manId);
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ManHourServiceImpl.java

@@ -21,6 +21,8 @@ import com.ankaibei.workFlow.webadmin.ankaibei.service.ManHourService;
 import com.ankaibei.workFlow.webadmin.ankaibei.utils.FlowTaskStart;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ManHourInfoVo;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.ResMsg;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -140,8 +142,22 @@ public class ManHourServiceImpl implements ManHourService {
             manHourMapper.deleteById(info.getManId());
             manHourJobMapper.deleteByManIdEquals(info.getManId());
         }
+        return new ResMsg(CodeEnum.OK);
+    }
 
-        return null;
+    @Override
+    public ResMsg findManHourByID(Integer manId) {
+        Optional<ManHourInfoEntity> byId = manHourMapper.findById(manId);
+        List<ManHourJobInfo> byManIdIs = manHourJobMapper.findManHourJobInfosByManIdIs(manId);
+        //ObjectMapper objectMapper = new ObjectMapper();
+        //String json = new String();
+        //try {
+        //    json = objectMapper.writeValueAsString(byManIdIs);
+        //} catch (JsonProcessingException e) {
+        //    e.printStackTrace();
+        //}
+        byId.get().setManHourJob(byManIdIs);
+        return new ResMsg(CodeEnum.OK, byId);
     }
 
 }

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/vo/FlowTaskVo.java

@@ -144,9 +144,9 @@ public class FlowTaskVo {
     private String totalMoney;
 
     /**
-     * 工作流任务类型
+     * 工作流任务状态
      */
-    @ApiModelProperty(value = "工作流任务类型")
+    @ApiModelProperty(value = "工作流任务状态")
     private String flowTaskStatus;
 
     /**