优化

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

@@ -136,6 +136,12 @@ outstoreform.process_instance_id,
         <if test="yyId!=null and yyId!=''">
             and outstoreform.yy_id = #{yyId}
         </if>
+        <if test="statusList!=null">
+            and outstoreform.status in
+            <foreach collection="statusList" separator="," close=")" open="(" item="item">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <!--<select id="selectList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
@@ -313,20 +319,21 @@ outstoreform.process_instance_id,
 
     <select id="getOutStoreFormCountByStatus" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
-        select status,count(1) as outStoreNum from t_out_store_form form left join t_store store
-        on store.id=form.store_id
+        select outstoreform.status,count(1) as outStoreNum from t_out_store_form outstoreform
+        LEFT JOIN t_repair_application_form repairForm ON outstoreform.pick_id = repairForm.id
         <where>
+            and outstoreform.status!=6
             <if test="userId!=null and userId!=''">
-                store.user_id=#{userId}
+                outstoreform.user_id=#{userId}
             </if>
             <if test="statusList!=null">
-                and form.status in
+                and outstoreform.status in
                 <foreach collection="statusList" separator="," close=")" open="(" item="item">
                     #{item}
                 </foreach>
             </if>
         </where>
-        group by status
+        group by outstoreform.status
 
     </select>
 

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

@@ -393,32 +393,39 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             List<Integer> statusList = new ArrayList<>();
             statusList.add(3);//推送失败
             statusList.add(4);//推送成功
-            inStoreFormDTO.setStatusList(statusList);
-            List<InStoreFormVO> inStoreFormVOS = inStoreFormMapper.getInStoreFormCountByStatus(inStoreFormDTO);
+            outStoreFormDTO.setOutFlag(0);
+            outStoreFormDTO.setStatusList(statusList);
+            List<OutStoreFormVO> inStoreFormVOS = outStoreFormMapper.selectList(outStoreFormDTO);
+            BigDecimal inSuccessNum = new BigDecimal(0);
+            BigDecimal inFailNum = new BigDecimal(0);
+            BigDecimal outSuccessNum = new BigDecimal(0);
+            BigDecimal outFailNum = new BigDecimal(0);
             if (inStoreFormVOS != null) {
-                for (InStoreFormVO vo : inStoreFormVOS) {
-                    if (vo.getStatus() == 3) {
-                        noticeNumberVO.setInStoreFailNum(vo.getInStoreNum());
-                    } else if (vo.getStatus() == 4) {
-                        noticeNumberVO.setInStoreSuccessNum(vo.getInStoreNum());
+                for (OutStoreFormVO vo : inStoreFormVOS) {
+                    if (vo.getStatus()==3){
+                        inFailNum = inFailNum.add(new BigDecimal(1));
+                    }else if (vo.getStatus()==4){
+                        inSuccessNum = inSuccessNum.add(new BigDecimal(1));
                     }
                 }
             }
+            noticeNumberVO.setInStoreFailNum(inFailNum);
+            noticeNumberVO.setInStoreSuccessNum(inSuccessNum);
+            outStoreFormDTO.setOutFlag(null);
             //出库
-            List<Integer> statusList2 = new ArrayList<>();
-            statusList2.add(3);//推送失败
-            statusList2.add(4);//推送成功
-            outStoreFormDTO.setStatusList(statusList2);
-            List<OutStoreFormVO> outStoreFormVOS = outStoreFormMapper.getOutStoreFormCountByStatus(outStoreFormDTO);
+            List<OutStoreFormVO> outStoreFormVOS = outStoreFormMapper.selectList(outStoreFormDTO);
             if (outStoreFormVOS != null) {
                 for (OutStoreFormVO vo : outStoreFormVOS) {
-                    if (vo.getStatus() == 3) {
-                        noticeNumberVO.setOutStoreFailNum(vo.getOutStoreNum());
-                    } else if (vo.getStatus() == 4) {
-                        noticeNumberVO.setOutStoreSuccessNum(vo.getOutStoreNum());
+                    if (vo.getStatus()==3){
+                        outFailNum = outFailNum.add(new BigDecimal(1));
+                    }else if (vo.getStatus()==4){
+                        outSuccessNum = outSuccessNum.add(new BigDecimal(1));
                     }
                 }
             }
+            noticeNumberVO.setOutStoreFailNum(outFailNum);
+            noticeNumberVO.setOutStoreSuccessNum(outSuccessNum);
+
         }
 //        noticeNumberVO.setOutStoreNum(outStoreCount==null?initNum:outStoreCount);
 //        if (noticeNumberVO.getRoleFlag()!=5) {
@@ -635,7 +642,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
 
                 outStoreFormDTO.setUserId(userInfo.getUserId());
-                outStoreFormDTO.setOutFlag(1);
                 noticeNumberVO = addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
             } else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
                 //维修管理员,先获取其deptid