月度对表

purchase-admin/src/main/java/com/ozs/web/controller/plan/MonthlyReconciliationController.java

@@ -65,6 +65,7 @@ public class MonthlyReconciliationController extends BaseController {
                            @RequestBody MonthlyReconciliationPageReqVo vo) {
         vo.setDeptId(getDeptId());
         vo.setUserId(getUserId());
+        vo.setRoleFlay(true);
         // 分页查询
         IPage<MonthlyReconciliation> page = monthlyReconciliationService.queryPage(vo);
         if (!ObjectUtils.isEmpty(page.getRecords()) && page.getRecords().size() > 0) {

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/MonthlyReconciliationPageReqVo.java

@@ -40,4 +40,6 @@ public class MonthlyReconciliationPageReqVo extends PageVo {
     private Long deptId;
 
     private Long userId;
+
+    public Boolean roleFlay;
 }

purchase-system/src/main/java/com/ozs/plan/mapper/MonthlyReconciliationMapper.java

@@ -14,9 +14,11 @@ import java.util.List;
 public interface MonthlyReconciliationMapper extends BaseMapper<MonthlyReconciliation> {
 
     @Select("select p.* from " +
-            " pm_demand p left join pm_audit_dept_ref r " +
-            " on p.demand_id = r.ref_id   " +
-            " where (#{userId} = 1  or  (r.dept_id = #{deptId} and  r.ref_type = 2) )    " +
+            " pm_demand p left join plan_practical pp on p.plan_id = pp.plan_practical_id" +
+            " left join pm_audit_dept_ref r  on pp.plan_practical_id = r.ref_id   " +
+            " where ( #{userId} = 1 " +
+            " or if(#{roleFlay},(r.dept_id = #{deptId} and  r.ref_type = 1), p.purchase_dept_id = #{deptId}  ) " +
+            " )" +
             " and (#{projectName} is null  or   p.project_name like concat('%',#{projectName},'%'))  " +
             " and (#{purchaseServices} is null  or   p.purchase_services = #{purchaseServices})  " +
             " and (#{projectStatus} is null  or   p.project_status = #{projectStatus})  " +

purchase-system/src/main/java/com/ozs/pm/service/impl/PmAuditDeptRefServiceImpl.java

@@ -101,9 +101,7 @@ public class PmAuditDeptRefServiceImpl extends ServiceImpl<PmAuditDeptRefMapper,
                         //refA采用初始化数据
                     } else {
                         //A限额了，找B
-                        refA = new PmAuditDeptRef(null, refId, refType, deptId,
-                                "A", 1, userId + "", now,
-                                userId + "", now);
+                        refA = null;
                         LambdaQueryWrapper<SysProcurementStandard> queryWrapperB = new LambdaQueryWrapper<>();
                         queryWrapperB.eq(SysProcurementStandard::getDeptId, bdeptId);
                         queryWrapperB.eq(SysProcurementStandard::getCategory, projectType.equals("2") ? "1" : projectType.equals("1") ? "2" : projectType);
@@ -130,7 +128,10 @@ public class PmAuditDeptRefServiceImpl extends ServiceImpl<PmAuditDeptRefMapper,
                         }
                     }
                 }
-                pmAuditDeptRefService.save(refA);
+                if (!ObjectUtils.isEmpty(refA)) {
+                    pmAuditDeptRefService.save(refA);
+                }
+
                 break;
             case "B":
                 // B的判断  最少插入1条。最多插入2条
@@ -152,12 +153,15 @@ public class PmAuditDeptRefServiceImpl extends ServiceImpl<PmAuditDeptRefMapper,
                     if (maximumB.compareTo(evaluation) == 1) {
                     } else {
                         //C不限额C审，
-                        refB = new PmAuditDeptRef(null, refId, refType, deptId, "B", 1, userId + "", now, userId + "", now);
+                        refB = null;
+//                        refB = new PmAuditDeptRef(null, refId, refType, deptId, "B", 1, userId + "", now, userId + "", now);
                         refC = new PmAuditDeptRef(null, refId, refType, cdeptId, "C", 0, userId + "", now, userId + "", now);
                         pmAuditDeptRefService.save(refC);
                     }
                 }
-                pmAuditDeptRefService.save(refB);
+                if (!ObjectUtils.isEmpty(refB)) {
+                    pmAuditDeptRefService.save(refB);
+                }
                 break;
             default:
                 //C不限额C审，