工时详情和费用详情

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/CostInfoMapper.java

@@ -26,9 +26,18 @@ public interface CostInfoMapper extends JpaRepository<CostInfoEntity, Integer>,
             , nativeQuery = true)
     Page<Map<String, String>> findCostInfoAll(Integer flowTaskStatus, Date happenDate, String paymentDate, Pageable page);
 
+    /**
+     * 费用详情
+     *
+     * @param applyCostId
+     * @param costType
+     * @return
+     */
+    CostInfoEntity findByApplyCostIdAndCostType(Integer applyCostId, String costType);
 
     @Transactional
     @Modifying
     @Query(value = "update cost_info SET flow_task_status = ?1 WHERE apply_cost_id = ?2 and cost_type=?3 ", nativeQuery = true)
     void updateCostInfoFlowStatus(String flowTaskStatus, Integer applyCostId, String costType);
+
 }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/ManHourJobMapper.java

@@ -11,6 +11,7 @@ import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +26,9 @@ public interface ManHourJobMapper extends JpaRepository<ManHourJobInfo, Integer>
      * 删除工时
      */
     int deleteByManIdEquals(Integer manId);
+
+    /**
+     * 工时详情
+     */
+    List<ManHourJobInfo> findManHourJobInfosByManIdIs(Integer manId);
 }

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

@@ -7,6 +7,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.enums.CostEnum;
 import com.ankaibei.workFlow.webadmin.ankaibei.mapper.*;
 import com.ankaibei.workFlow.webadmin.ankaibei.service.CostInfoService;
 import com.ankaibei.workFlow.webadmin.ankaibei.vo.*;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -97,8 +98,10 @@ public class CostInfoServiceImpl implements CostInfoService {
 
     @Override
     public ResMsg findCostInfoDetails(CostInfoEntity costInfoEntity) {
-        Optional<CostInfoEntity> byId = costInfoMapper.findById(costInfoEntity.getCostId());
-        CostInfoEntity costInfo = byId.orElse(null);
+        CostInfoEntity costInfo = costInfoMapper.findByApplyCostIdAndCostType(costInfoEntity.getCostId(), costInfoEntity.getCostType());
+        if (ObjectUtils.isEmpty(costInfo)) {
+            return new ResMsg(CodeEnum.NO_DATA);
+        }
         switch (CostEnum.getEnumByCode(costInfoEntity.getCostType())) {
             case COMMUNICATION:
                 CommunicationInfoEntity communicationInfoEntity = communicationMapper.findById(costInfo.getApplyCostId()).orElse(null);

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

@@ -3,6 +3,7 @@ package com.ankaibei.workFlow.webadmin.ankaibei.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONPObject;
 import com.ankaibei.workFlow.common.core.object.ResponseResult;
 import com.ankaibei.workFlow.common.core.object.TokenData;
 import com.ankaibei.workFlow.common.flow.constant.FlowConstant;
@@ -65,6 +66,9 @@ public class ManHourServiceImpl implements ManHourService {
             Map<Object, Object> map1 = new HashMap<>();
             map1.putAll(map);
             String projectId = map.get("projectName");
+            map1.put("manHour", map.get("manHour") + "天");
+            List<ManHourJobInfo> byManIdIs = manHourJobMapper.findManHourJobInfosByManIdIs(Integer.valueOf(map1.get("manId").toString()));
+            map1.put("manHourJob", byManIdIs);
             Optional<ProjectInfoEntity> byId = projectInfoMapper.findById(Integer.valueOf(projectId));
             map1.put("projectName", byId.orElse(null) != null ? byId.orElse(null).getProjectName() : null);
             return map1;