完善

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairFeeDTO.java

@@ -142,4 +142,8 @@ public class RepairFeeDTO extends BaseDTO implements Serializable {
 
     private String searchTime;
 
+    private LocalDate feeDateStart;
+
+    private LocalDate feeDateEnd;
+
 }

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -73,6 +73,15 @@
             <if test="category != null and category != ''">
                 and application.category = #{category}
             </if>
+            <if test="repairUserId != null">
+                and application.repair_user_id = #{repairUserId}
+            </if>
+            <if test="feeDateStart != null">
+                and fee.fee_date <![CDATA[ >= ]]> #{feeDateStart}
+            </if>
+            <if test="feeDateEnd != null">
+                and fee.fee_date <![CDATA[ <= ]]> #{feeDateEnd}
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object" resultType="com.platform.dao.entity.repair.RepairFee">
@@ -82,9 +91,7 @@
         LEFT JOIN t_sb_info sbInfo on fee.sb_id = sbInfo.id
         LEFT JOIN t_sb_type sbType on sbType.id = sbInfo.type_id
         LEFT JOIN t_repair_application_form application on fee.repair_id = application.id
-        <include refid="Base_Column_List"/>
-        from t_repair_fee
-        where id = #{id,jdbcType=VARCHAR}
+        where fee.id = #{id,jdbcType=VARCHAR}
     </select>
 
     <!-- 维修费用数据 -->
@@ -96,11 +103,11 @@
             <if test="repairUserId != null">
                 and rf.repair_user_id = #{repairUserId}
             </if>
-            <if test="searchStartTime != null">
-                and rf.repair_start_time <![CDATA[ > ]]> #{searchStartTime}
+            <if test="feeDateStart != null">
+                and fee.fee_date <![CDATA[ >= ]]> #{feeDateStart}
             </if>
-            <if test="searchEndTime != null">
-                and rf.repair_start_time <![CDATA[ < ]]> #{searchEndTime}
+            <if test="feeDateEnd != null">
+                and fee.fee_date <![CDATA[ <= ]]> #{feeDateEnd}
             </if>
         </where>
         group by fee.type

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -16,6 +16,7 @@ import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
+import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
@@ -24,14 +25,12 @@ import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
-import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
-import com.platform.dao.mapper.repair.RepairCheckMapper;
-import com.platform.dao.mapper.repair.RepairFormMapper;
-import com.platform.dao.mapper.repair.RepairReasonMapper;
+import com.platform.dao.mapper.repair.*;
 import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.SysUserVO;
+import com.platform.dao.vo.query.repair.RepairFeeVO;
 import com.platform.dao.vo.query.workplace.WorkplaceRepairVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.report.RepairReport24VO;
@@ -48,6 +47,7 @@ import com.platform.service.upms.SysUserService;
 import com.platform.service.util.SysFileUtils;
 import com.platform.service.wechat.util.WeChatMessageUtil;
 import lombok.AllArgsConstructor;
+import org.bouncycastle.pqc.math.linearalgebra.BigEndianConversions;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.weekend.Weekend;
@@ -81,6 +81,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final SbInfoService sbInfoService;
     private final SysFileMapper sysFileMapper;
     private final SysUserMapper userMapper;
+    private final RepairFeeMapper repairFeeMapper;
 
     @Override
     public List<RepairApplicationFormVO> getVOListByDTO(RepairApplicationFormDTO model) {
@@ -873,7 +874,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         // 获取内部维修数据
         RepairApplicationFormDTO queryDTO = new RepairApplicationFormDTO();
         queryDTO.setType(RepairApplicationFormTypeEnum.IN.getValue());
-        queryDTO.setSearchTime(searchTime);
+        //queryDTO.setSearchTime(searchTime);
         queryDTO.setRepairUserId(userId);
         List<RepairApplicationFormVO> list = mapper.getWorkplaceRepairData(queryDTO);
         if(list != null && list.size() > 0){
@@ -893,13 +894,27 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         queryDTO.setSearchTime(null);
         int year = LocalDateTime.now().getYear();
         int month = LocalDateTime.now().getMonthValue();
-        queryDTO.setSearchStartTime(DateUtils.getFirstDayOfMonth(year, month));
-        queryDTO.setSearchEndTime(DateUtils.getLastDayOfMonth(year, month));
+        LocalDateTime start = DateUtils.getFirstDayOfMonth(year, month);
+        LocalDateTime end = DateUtils.getLastDayOfMonth(year, month);
+        queryDTO.setSearchStartTime(start);
+        queryDTO.setSearchEndTime(end);
         RepairApplicationFormVO voInfo = mapper.getWorkplaceRepairSumData(queryDTO);
         if(voInfo != null){
-            vo.setTotalFee(voInfo.getTempTotalFee());
             vo.setTotalNum(vo.getTotalNum());
         }
+        RepairFeeDTO repairFeeDTO = new RepairFeeDTO();
+        repairFeeDTO.setRepairUserId(userId);
+        repairFeeDTO.setFeeDateEnd(end.toLocalDate());
+        repairFeeDTO.setFeeDateStart(start.toLocalDate());
+        List<RepairFeeVO> feeList = repairFeeMapper.listForWorkplacePie(repairFeeDTO);
+        // 本月费用
+        double totalFee = 0.0;
+        if(feeList != null && feeList.size() > 0){
+            for(RepairFeeVO feeVO : feeList){
+                totalFee += feeVO.getFee();
+            }
+        }
+        vo.setTotalFee(new BigDecimal(totalFee));
         return vo;
     }
 
@@ -948,6 +963,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             // 内部维修
             switch (result.getStatus().intValue()){
                 case CommonConstants.NOT_ALLOCATED:
+                    vo.setCompletedRepairNum(vo.getCompletedRepairNum().add(tempNum));
+                    break;
                 case CommonConstants.PROCESSING:
                     vo.setWaitForRepairNum(vo.getWaitForRepairNum().add(tempNum));
                     break;
@@ -958,9 +975,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 case CommonConstants.REBACK:
                     vo.setRefusedRepairNum(vo.getRefusedRepairNum().add(tempNum));
                     break;
-                case CommonConstants.FINISHED:
-                    vo.setCompletedRepairNum(vo.getCompletedRepairNum().add(tempNum));
-                    break;
             }
         }else if(RepairApplicationFormTypeEnum.OUT.getValue() == type) {
             vo.setOutRepairFee(vo.getOutRepairFee().add(result.getTempTotalFee()));
@@ -968,6 +982,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             // 委外
             switch (result.getStatus()){
                 case CommonConstants.NOT_ALLOCATED:
+                    vo.setOutCompletedRepairNum(vo.getOutCompletedRepairNum().add(tempNum));
+                    break;
                 case CommonConstants.PROCESSING:
                     vo.setOutWaitForRepairNum(vo.getOutWaitForRepairNum().add(tempNum));
                     break;
@@ -978,9 +994,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 case CommonConstants.REBACK:
                     vo.setOutRefusedRepairNum(vo.getOutRefusedRepairNum().add(tempNum));
                     break;
-                case CommonConstants.FINISHED:
-                    vo.setOutCompletedRepairNum(vo.getOutCompletedRepairNum().add(tempNum));
-                    break;
             }
         }
     }

platform-service/src/main/java/com/platform/service/repair/impl/RepairFeeServiceImpl.java

@@ -302,8 +302,8 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
     public List<RepairFeeVO> listForWorkplacePie(String userId,LocalDateTime start,LocalDateTime end) {
         // 查询统计费用类别数据
         RepairFeeDTO queryDTO = new RepairFeeDTO();
-        queryDTO.setSearchStartTime(start);
-        queryDTO.setSearchEndTime(end);
+        queryDTO.setFeeDateEnd(start.toLocalDate());
+        queryDTO.setFeeDateEnd(end.toLocalDate());
         queryDTO.setRepairUserId(userId);
         List<RepairFeeVO> list = mapper.listForWorkplacePie(queryDTO);
         if(list == null){

platform-service/src/main/java/com/platform/service/workplace/impl/IndexServiceImpl.java

@@ -7,9 +7,7 @@ import com.platform.common.util.SecurityUtils;
 import com.platform.service.repair.RepairApplicationFormService;
 import com.platform.service.repair.RepairFeeService;
 import com.platform.service.sqarepartmanage.SparePartInfoService;
-import com.platform.service.store.InStoreDetailService;
 import com.platform.service.store.InStoreFormService;
-import com.platform.service.store.impl.InStoreDetailServiceImpl;
 import com.platform.service.workplace.IndexService;
 import org.springframework.stereotype.Service;