采购单优化

platform-dao/src/main/java/com/platform/dao/dto/store/PurchaseStoreFormDTO.java

@@ -111,4 +111,6 @@ public class PurchaseStoreFormDTO extends BaseDTO implements Serializable {
 
     private BigDecimal price;
 
+    private List<Integer> statusList;
+
 }

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

@@ -23,4 +23,6 @@ public interface PurchaseStoreFormMapper extends MyMapper<PurchaseStoreForm> {
      */
     List<PurchaseStoreFormVO> selectList(PurchaseStoreFormDTO dto);
 
+    List<PurchaseStoreForm> selectListByUser(PurchaseStoreFormDTO dto);
+
 }

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

@@ -134,8 +134,7 @@
     <!-- 维修统计数据 -->
     <select id="getWorkplaceRepairData" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
             resultType="com.platform.dao.vo.repair.RepairApplicationFormVO">
-        select count(1) as tempTotalNum,sum(fee.fee) as tempTotalFee,rf.status from t_repair_application_form rf
-        join t_repair_fee fee on fee.repair_id = rf.id
+        select count(1) as tempTotalNum,rf.status from t_repair_application_form rf
         <where>
             <if test="repairUserId != null">
                 and rf.repair_user_id = #{repairUserId}

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

@@ -86,4 +86,19 @@
             <include refid="List_Condition"/>
         </where>
     </select>
+
+    <select id="selectListByUser" parameterType="com.platform.dao.dto.store.PurchaseStoreFormDTO" resultType="com.platform.dao.entity.store.PurchaseStoreForm">
+        select * from t_purchase_store_form
+        <where>
+            <if test="statusList != null and statusList.size > 0">
+                AND status in
+                <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="createdUserId != null">
+                and created_user_id = #{createdUserId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -10,7 +10,6 @@ import com.platform.common.cache.ConfigCache;
 import com.platform.common.cache.DictCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.constant.RedisKeyConstants;
-import com.platform.common.enums.DataFilterTypeEnum;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
@@ -48,7 +47,6 @@ 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;
@@ -981,29 +979,24 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
      */
     private void packageInfo(Integer type,RepairApplicationFormVO result,WorkplaceRepairVO vo){
         BigDecimal tempNum = result.getTempTotalNum();
-        BigDecimal tempFee = result.getTempTotalNum();
         if(RepairApplicationFormTypeEnum.IN.getValue() == type){
             // 内部维修
             switch (result.getStatus().intValue()){
                 case CommonConstants.NOT_ALLOCATED:
                     vo.setCompletedRepairNum(vo.getCompletedRepairNum().add(tempNum));
-                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
                     vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.PROCESSING:
                     vo.setWaitForRepairNum(vo.getWaitForRepairNum().add(tempNum));
-                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
                     vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.WAIT_SUBMIT:
                 case CommonConstants.NOT_ACCEPTANCE:
                     vo.setVerifyRepairNum(vo.getVerifyRepairNum().add(tempNum));
-                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
                     vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.REBACK:
                     vo.setRefusedRepairNum(vo.getRefusedRepairNum().add(tempNum));
-                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
                     vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
             }
@@ -1012,23 +1005,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             switch (result.getStatus()){
                 case CommonConstants.NOT_ALLOCATED:
                     vo.setOutCompletedRepairNum(vo.getOutCompletedRepairNum().add(tempNum));
-                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
                     vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.PROCESSING:
                     vo.setOutWaitForRepairNum(vo.getOutWaitForRepairNum().add(tempNum));
-                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
                     vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.WAIT_SUBMIT:
                 case CommonConstants.NOT_ACCEPTANCE:
                     vo.setOutVerifyRepairNum(vo.getOutVerifyRepairNum().add(tempNum));
-                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
                     vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.REBACK:
                     vo.setOutRefusedRepairNum(vo.getOutRefusedRepairNum().add(tempNum));
-                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
                     vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
             }

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

@@ -86,14 +86,17 @@ public class PurchaseStoreFormServiceImpl extends BaseServiceImpl<PurchaseStoreF
         UserInfo userInfo = SecurityUtils.getUserInfo();
         try{
             // 用户名下已创建单数
-            PurchaseStoreForm queryForm = new PurchaseStoreForm();
-            queryForm.setCreatedUserId(userInfo.getUserId());
-            queryForm.setStatus(PurchaseStoreFormStatusEnum.CREATED.getValue());
-            List<PurchaseStoreForm> formList = mapper.select(queryForm);
+            PurchaseStoreFormDTO queryFormDTO = new PurchaseStoreFormDTO();
+            queryFormDTO.setCreatedUserId(userInfo.getUserId());
+            List<Integer> statusList = new ArrayList<>();
+            statusList.add(PurchaseStoreFormStatusEnum.CREATED.getValue());
+            statusList.add(PurchaseStoreFormStatusEnum.PURCHASING.getValue());
+            queryFormDTO.setStatusList(statusList);
+            List<PurchaseStoreForm> formList = mapper.selectListByUser(queryFormDTO);
             if(formList == null || formList.size() == 0 || formList.size() > 1){
                 throw new DeniedException("您尚未创建采购单或多个采购单");
             }
-            queryForm = formList.get(0);
+            PurchaseStoreForm queryForm = formList.get(0);
             if(StringUtils.isBlank(record.getSpareId())){
                 throw new DeniedException("备件ID未携带");
             }