Merge remote-tracking branch 'origin/demo_' into demo_

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

@@ -319,4 +319,20 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     private LocalDateTime searchEndTime;
 
     private String searchTime;
+
+    /**
+     * 1 待维修  2 待审核 3 已完成 4 已驳回
+     */
+    private Integer statusSearchType;
+
+    private LocalDateTime repairStartTimeStart;
+
+    private LocalDateTime repairStartTimeEnd;
+
+    /**
+     * 维修人员ID，原有的被用在特殊地方，详见.xml
+     */
+    private String queryRepairUserId;
+
+    private List<Integer> statusList;
 }

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairApplicationFormMapper.java

@@ -45,4 +45,11 @@ public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationF
      * @return
      */
     List<RepairApplicationFormVO> getCurrentlyList(RepairApplicationFormDTO model);
+
+    /**
+     * 统计累计数据
+     * @param model
+     * @return
+     */
+    RepairApplicationFormVO getWorkplaceRepairSumData(RepairApplicationFormDTO model);
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/StoreMapper.java

@@ -23,4 +23,7 @@ public interface StoreMapper extends MyMapper<Store> {
      */
     List<StoreVO> selectList(StoreDTO dto);
 
+    List<StoreVO> selectVOList(StoreDTO model);
+
+    Integer getStoreNums(String userId);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/store/StoreWorkBenchVO.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -27,6 +28,10 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
     private List<InStoreDetailVO> inStoreDetailVOS;
     private List<OutStoreDetailVO> outStoreDetailVOS;
 
+    /**
+     * 仓库总数
+     */
+    private Integer storeNums;
     /**
      * 待调拨出库数量
      */
@@ -73,9 +78,11 @@ public class StoreWorkBenchVO extends BaseVO implements Serializable {
      */
     private Integer otherNum;
     /**
-     * 备件总数
+     * 备件总价值
      */
-    private Integer totalNum;
+
+
+    private BigDecimal totalPrice;
     /**
      * 采购已入库数量(近一周内)
      */

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

@@ -92,6 +92,22 @@
             <if test="searchEndTime != null">
                 and application.apply_time <![CDATA[ <= ]]> #{searchEndTime}
             </if>
+            <!-- 新增查询参数 -->
+            <if test="queryRepairUserId != null">
+                and application.repair_user_id = #{queryRepairUserId}
+            </if>
+            <if test="statusList != null and statusList.size > 0">
+                AND application.status in
+                <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="repairStartTimeStart != null">
+                and application.repair_start_time <![CDATA[ > ]]> #{repairStartTimeStart}
+            </if>
+            <if test="repairStartTimeEnd != null">
+                and application.repair_start_time <![CDATA[ < ]]> #{repairStartTimeEnd}
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object"
@@ -149,4 +165,24 @@
             </if>
         </where>
     </select>
+    <!-- 近月统计单数和费用 -->
+    <select id="getWorkplaceRepairSumData" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
+            resultType="com.platform.dao.vo.repair.RepairApplicationFormVO">
+        select count(1) as tempTotalNum,sum(fee.fee) as tempTotalFee from t_repair_application_form rf
+        join t_repair_fee fee on fee.repair_id = rf.id
+        <where>
+            <if test="repairUserId != null">
+                and rf.repair_user_id = #{repairUserId}
+            </if>
+            <if test="searchStartTime != null">
+                and rf.repair_start_time <![CDATA[>]]> #{searchStartTime}
+            </if>
+            <if test="searchEndTime != null">
+                and rf.repair_start_time <![CDATA[<]]> #{searchEndTime}
+            </if>
+            <if test="type != null">
+                and rf.type = #{type}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -96,8 +96,11 @@
             <if test="repairUserId != null">
                 and rf.repair_user_id = #{repairUserId}
             </if>
-            <if test="searchTime != null">
-                and rf.repair_start_time like concat('',#{searchTime},'%')
+            <if test="searchStartTime != null">
+                and rf.repair_start_time <![CDATA[ > ]]> #{searchStartTime}
+            </if>
+            <if test="searchEndTime != null">
+                and rf.repair_start_time <![CDATA[ < ]]> #{searchEndTime}
             </if>
         </where>
         group by fee.type

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -157,6 +157,7 @@
         select detail.*,form.status
         from t_in_store_detail detail
         left join t_in_store_form form on form.id = detail.in_id
+
     </select>
 
 

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -255,4 +255,5 @@
             where id = #{item.id}
         </foreach>
     </update>
+
 </mapper>

platform-dao/src/main/resources/mapper/store/StoreMapper.xml

@@ -117,4 +117,18 @@
         </where>
         order by store.sort asc
     </select>
+
+    <select id="getStoreNums" parameterType="com.platform.dao.dto.store.StoreDTO"
+            resultType="int"
+    >
+        select count(*) from t_store
+        <where>
+        1=1
+        <if test="userId!=null">
+            and user_id=#{userId}
+        </if>
+        </where>
+
+    </select>
+
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/store/StoreController.java

@@ -41,7 +41,9 @@ public class StoreController {
 
   private final  StoreService storeService;
 
-  /**
+
+
+    /**
    * 通过id查询单条记录
    *
    * @param id 主键

platform-service/src/main/java/com/platform/service/repair/RepairFeeService.java

@@ -8,6 +8,7 @@ import com.platform.dao.vo.report.RepairSbInfoReportFee;
 import com.platform.service.base.IBaseService;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -30,5 +31,5 @@ public interface RepairFeeService extends IBaseService<RepairFee, RepairFeeDTO>
 
     List<RepairSbInfoReportFee> getSbInfoReport(RepairFeeDTO dto, Integer year);
 
-    List<RepairFeeVO> listForWorkplacePie(String userId,String searchTime);
+    List<RepairFeeVO> listForWorkplacePie(String userId, LocalDateTime start,LocalDateTime end);
 }

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

@@ -168,6 +168,23 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 }
             }
         }
+        if(record.getStatusSearchType() != null){
+            List<Integer> statusList = new ArrayList<>();
+            if(record.getStatusSearchType() == 1){ // 待维修
+                statusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+                statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+            }
+            if(record.getStatusSearchType() == 2){ // 待审核
+                statusList.add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
+                statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
+            }
+            if(record.getStatusSearchType() == 3){ // 已完成
+                statusList.add(RepairApplicationFormStatusEnum.FINISHED.getValue());
+            }
+            if(record.getStatusSearchType() == 4){ // 已驳回
+                statusList.add(RepairApplicationFormStatusEnum.REBACK.getValue());
+            }
+        }
         return new MyVOPage<>(mapper.selectPageList(record));
     }
 
@@ -872,8 +889,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             }
         }
         // 统计总和数据
-        vo.setTotalFee(vo.getRepairFee().add(vo.getOutRepairFee()));
-        vo.setTotalNum(vo.getRepairTotalNum().add(vo.getOutRepairTotalNum()));
+        queryDTO.setType(null);
+        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));
+        RepairApplicationFormVO voInfo = mapper.getWorkplaceRepairSumData(queryDTO);
+        if(voInfo != null){
+            vo.setTotalFee(voInfo.getTempTotalFee());
+            vo.setTotalNum(vo.getTotalNum());
+        }
         return vo;
     }
 

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

@@ -299,12 +299,16 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
     }
 
     @Override
-    public List<RepairFeeVO> listForWorkplacePie(String userId,String searchTime) {
+    public List<RepairFeeVO> listForWorkplacePie(String userId,LocalDateTime start,LocalDateTime end) {
         // 查询统计费用类别数据
         RepairFeeDTO queryDTO = new RepairFeeDTO();
-        queryDTO.setSearchTime(searchTime);
+        queryDTO.setSearchStartTime(start);
+        queryDTO.setSearchEndTime(end);
         queryDTO.setRepairUserId(userId);
-        List<RepairFeeVO> list = mapper.listForWorkplacePie(queryDTO) == null ? new ArrayList<>() : mapper.listForWorkplacePie(queryDTO);
+        List<RepairFeeVO> list = mapper.listForWorkplacePie(queryDTO);
+        if(list == null){
+            list = new ArrayList<>();
+        }
         SysConfig sysConfig = sysConfigService.getByCode(SysConfigEnum.REPAIR_FEE_TYPE_MAPS.toString());
         if(sysConfig != null) {
             List<RepairFeeVO> voList = JSONArray.parseArray(sysConfig.getContent(), RepairFeeVO.class);

platform-service/src/main/java/com/platform/service/store/StoreService.java

@@ -81,4 +81,5 @@ public interface StoreService extends IBaseService<Store, StoreDTO> {
     String importListAddAndUpdate(String storeId, MultipartFile file);
 
     String changeStore(String sourceStoreId, String destStoreId);
+
 }

platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -65,6 +65,7 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     private OutStoreDetailMapper outStoreDetailMapper;
     private InStoreFormMapper inStoreFormMapper;
     private OutStoreFormMapper outStoreFormMapper;
+    private StoreMapper storeMapper;
 
 
     @Override
@@ -131,12 +132,16 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
 
     @Override
     public StoreWorkBenchVO getStoreWorkBenchVO(String userId) {
+        StoreDTO query=new StoreDTO();
+        query.setUserId(userId);
+        Integer count=storeMapper.getStoreNums(userId);
+
         SpareStoreDTO spareStoreDTO=new SpareStoreDTO();
         spareStoreDTO.setUserId(userId);
         List<SpareStoreVO> spareStoreVOS=spareStoreMapper.selectList(spareStoreDTO);
-        int totalNum=0;
+        Double totalPrice=0.0;
         for(SpareStoreVO vo:spareStoreVOS){
-            totalNum+=vo.getNum().intValue();
+            totalPrice+=(vo.getNum().intValue())*(vo.getPrice().doubleValue());
         }
         InStoreFormDTO queryDTO=new InStoreFormDTO();
         queryDTO.setUserId(userId);
@@ -219,7 +224,8 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         storeWorkBenchVO.setOtherOutNum(otherNum2);
         storeWorkBenchVO.setOutPDNum(pdNum);
         storeWorkBenchVO.setOutTotalNum(num1);
-        storeWorkBenchVO.setTotalNum(totalNum);
+        storeWorkBenchVO.setTotalPrice(new BigDecimal(totalPrice));
+        storeWorkBenchVO.setStoreNums(count);
         return storeWorkBenchVO;
     }
 

platform-service/src/main/java/com/platform/service/store/impl/StoreServiceImpl.java

@@ -400,4 +400,7 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store, StoreD
         }
         return result;
     }
+
+
+
 }

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

@@ -54,13 +54,15 @@ public class IndexServiceImpl implements IndexService {
     public R getWorkplaceLeftPie(String roleCode) {
         String userId = SecurityUtils.getUserInfo().getUserId();
         LocalDateTime now = LocalDateTime.now();
+        int year = now.getYear();
+        int month = now.getDayOfMonth();
         R r = R.success();
         switch (roleCode){
             case CommonConstants.WORKPLACE_REPAIR_NORMAL:
-                r.setData(repairFeeService.listForWorkplacePie(userId, DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
+                r.setData(repairFeeService.listForWorkplacePie(userId, DateUtils.getFirstDayOfMonth(year, month),DateUtils.getLastDayOfMonth(year, month)));
                 break;
             case CommonConstants.WORKPLACE_REPAIR_MANAGE:
-                r.setData(repairFeeService.listForWorkplacePie(null, DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));
+                r.setData(repairFeeService.listForWorkplacePie(null, DateUtils.getFirstDayOfMonth(year, month),DateUtils.getLastDayOfMonth(year, month)));
                 break;
             case CommonConstants.WORKPLACE_STORE_MANAGE:
                 r.setData(sparePartInfoService.listForWorkplacePie(null,DateUtils.dateToString(now,DateUtils.PATTERN_YMD)));