仓库报表

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

@@ -26,6 +26,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class InStoreFormVO extends BaseVO implements Serializable {
 
+    private Integer roleFlag;
+
     /**
      * 主键
      */

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

@@ -25,6 +25,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
+    private Integer roleFlag;
 
     /**
      * 主键

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

@@ -330,12 +330,6 @@
             <if test="dispatchUserId!=null and dispatchUserId!=''">
                 and dispatch_user_id=#{dispatchUserId}
             </if>
-            <if test="statusList != null and statusList.size > 0">
-                AND status in
-                <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
         </where>
         order by update_time desc
         limit 1
@@ -344,6 +338,23 @@
     <select id="getRepairCount1" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
             resultType="int">
         select count(*) from t_repair_application_form
-        where status=#{status} and repair_user_id=#{repairUserId}
+        <where>
+            and repair_user_id=#{repairUserId}
+            <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="userId!=null and userId!=''">
+                user_id=#{userId}
+            </if>
+            <if test="repairUserId!=null and repairUserId!=''">
+                repair_user_id=#{repairUserId}
+            </if>
+            <if test="dispatchUserId!=null and dispatchUserId!=''">
+                dispatch_user_id=#{dispatchUserId}
+            </if>
+        </where>
     </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -367,11 +367,13 @@ public class RepairApplicationFormController {
             roleCodes.append(item).append(",");
         });
         String role = roleCodes.toString();
-        if(role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())||role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())||
-                role.contains(SysRoleCodeEnum.Maintenance.name())){
-            return new R(repairApplicationFormService.getRepairApplicationFormVO());
-        }else if(role.contains(CommonConstants.WORKPLACE_STORE_NORMAL)||role.contains(CommonConstants.WORKPLACE_STORE_MANAGE)){
-            return new R(repairApplicationFormService.getStoreForm());
+        if(userInfo.getSuperAdmin()==0) {
+            if (role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) || role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name()) ||
+                    role.contains(SysRoleCodeEnum.Maintenance.name())) {
+                return new R(repairApplicationFormService.getRepairApplicationFormVO());
+            } else if (role.contains(CommonConstants.WORKPLACE_STORE_NORMAL) || role.contains(CommonConstants.WORKPLACE_STORE_MANAGE)) {
+                return new R(repairApplicationFormService.getStoreForm());
+            }
         }
         return new R<>(null);
     }

platform-rest/src/main/resources/application-dev.yml

@@ -53,6 +53,11 @@ spring:
 # 直接放行URL
 ignore:
   urls:
+    - /repair/application-forms/**
+    - /check/jobs/**
+    - /repair/application-forms/**
+    - /store/stores/**
+    - /store/spare-stores/**
     - /sb/infos/**
     - /upms/logs/**
     - /upms/dicts/data

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

@@ -268,10 +268,15 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         OutStoreFormVO outStoreFormVO=new OutStoreFormVO();
         InStoreFormVO inStoreFormVO=inStoreFormMapper.getRentleInStoreForm(inStoreFormDTO);
         BigDecimal count=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
+        int roleFlag=0;
         if(inStoreFormVO!=null){
+            roleFlag=4;
+            inStoreFormVO.setRoleFlag(roleFlag);
             inStoreFormVO.setInStoreNum(count);
             return new R(inStoreFormVO);
         }else{
+            roleFlag=5;
+            inStoreFormVO.setRoleFlag(roleFlag);
             OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
             outStoreFormDTO.setUserId(userInfo.getUserId());
             outStoreFormVO=outStoreFormMapper.getRentleOutStoreForm(outStoreFormDTO);
@@ -303,36 +308,36 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             roleCodes.append(item).append(",");
         });
         String role = roleCodes.toString();
+        int roleFlag=0;
         if(userInfo.getSuperAdmin() == 0){ // 非超级管理员
             if(role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
+                roleFlag=1;
                 // 维修主管
                 repairApplicationFormDTO.setDispatchUserId(userInfo.getUserId());
+                //带派工
                 repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
-                repairApplicationFormDTO.setRoleFlag(1);
+                //维修完成
+                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.FINISHED.getValue());
+                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REBACK.getValue());
             }else if(role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
+                roleFlag=2;
                 // 报修+终审
                 repairApplicationFormDTO.setUserId(userInfo.getUserId());
+                //审核中
                 repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
-                repairApplicationFormDTO.setRoleFlag(2);
+                //保修驳回
+                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REFUSED_REPAIR.getValue());
             }else if(role.contains(SysRoleCodeEnum.Maintenance.name())){
+                roleFlag=3;
                 repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
-                repairApplicationFormDTO.setRoleFlag(3);
-                repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
-                repairApplicationFormVO.setRoleFlag(3);
+                repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+//                repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
+//                repairApplicationFormVO.setRoleFlag(3);
             }
         }
         int count=0;
-        if(repairApplicationFormVO.getRoleFlag()==3){
-            //获取该用户下所有维修中数字
-            repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
-            count=mapper.getRepairCount1(repairApplicationFormDTO);
-            repairApplicationFormVO.setRepairCount(count);
-            return repairApplicationFormVO;
-        }
         repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
-        repairApplicationFormDTO.setStatus(repairApplicationFormVO.getStatus());
+        repairApplicationFormVO.setRoleFlag(roleFlag);
         count=mapper.getRepairCount1(repairApplicationFormDTO);
         repairApplicationFormVO.setRepairCount(count);
         return repairApplicationFormVO;