sop管理菜单加入服务单元状态限制

sop-api/src/main/java/com/qmth/sop/server/api/TBDelayWarnController.java

@@ -36,11 +36,9 @@ import javax.validation.constraints.Min;
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DELAY_WARN)
 public class TBDelayWarnController {
 
-
     @Resource
     TBDelayWarnService tBDelayWarnService;
 
-
     @ApiOperation(value = "延期预警跟进表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表查询结果", response = TBDelayWarnResult.class)})
@@ -58,7 +56,6 @@ public class TBDelayWarnController {
         return ResultUtil.ok(tBDelayWarnService.query(new Page<>(pageNumber, pageSize), type, status, serviceId, custom, fieldObj, sopNo, startTime, endTime, null));
     }
 
-
     @ApiOperation(value = "延期预警跟进表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表信息", response = TBDelayWarnResult.class)})
@@ -67,7 +64,6 @@ public class TBDelayWarnController {
     }
 
     //关闭延期预警跟进
-
     @ApiOperation(value = "关闭延期预警跟进")
     @RequestMapping(value = "/close", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "关闭成功")})
@@ -79,8 +75,8 @@ public class TBDelayWarnController {
         tBDelayWarnService.saveTBDelayWarn(tBDelayWarn);
         return ResultUtil.ok();
     }
-    //重启延期预警跟进
 
+    //重启延期预警跟进
     @ApiOperation(value = "重启延期预警跟进")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重启成功")})

sop-api/src/main/java/com/qmth/sop/server/api/TBViolationController.java

@@ -38,13 +38,11 @@ import javax.validation.constraints.Min;
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_VIOLATION)
 public class TBViolationController {
 
-
     @Resource
     TBViolationService tBViolationService;
     @Resource
     SysUserService sysUserService;
 
-
     @ApiOperation(value = "sop违规登记表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "sop违规登记表查询结果", response = TBViolationResult.class)})
@@ -75,9 +73,7 @@ public class TBViolationController {
         return ResultUtil.ok(tBViolationService.saveTBViolation(tBViolation));
     }
 
-
     //关闭违规登记
-
     @ApiOperation(value = "关闭违规登记")
     @RequestMapping(value = "/close", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "关闭成功")})
@@ -90,7 +86,6 @@ public class TBViolationController {
     }
 
     //重启违规登记
-
     @ApiOperation(value = "重启违规登记")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重启成功")})
@@ -101,7 +96,6 @@ public class TBViolationController {
         return ResultUtil.ok(tBViolationService.saveTBViolation(tBViolation));
     }
 
-
     //根据code的获取详细信息
     @ApiOperation(value = "sop违规登记表获取单个接口")
     @RequestMapping(value = "/getByCode", method = RequestMethod.POST)
@@ -115,7 +109,6 @@ public class TBViolationController {
     @RequestMapping(value = "/creator/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "创建者list", response = SysUser.class)})
     public Result getCreatorList() {
-
         return ResultUtil.ok(sysUserService.lambdaQuery().inSql(SysUser::getId, "select DISTINCT create_id from t_b_violation").list());
     }
 
@@ -126,5 +119,4 @@ public class TBViolationController {
 
         return ResultUtil.ok(sysUserService.lambdaQuery().inSql(SysUser::getId, "select DISTINCT user_id from t_b_violation").list());
     }
-
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/BasicAttachmentServiceImpl.java

@@ -74,8 +74,8 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
             throw ExceptionResultEnum.ERROR.exception("文件名长度不能超过" + attachmentLength + "个字符");
         }
         long size = file.length();
-        BigDecimal b = new BigDecimal(size);
-        BigDecimal num = new BigDecimal(1024);
+        BigDecimal b = BigDecimal.valueOf(size);
+        BigDecimal num = BigDecimal.valueOf(1024);
         b = b.divide(num, 2, BigDecimal.ROUND_HALF_UP).divide(num, 2, BigDecimal.ROUND_HALF_UP)
                 .setScale(2, BigDecimal.ROUND_HALF_UP);
 
@@ -117,8 +117,8 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
             throw ExceptionResultEnum.ERROR.exception("文件名长度不能超过" + attachmentLength + "个字符");
         }
         long size = file.getSize();
-        BigDecimal b = new BigDecimal(size);
-        BigDecimal num = new BigDecimal(1024);
+        BigDecimal b = BigDecimal.valueOf(size);
+        BigDecimal num = BigDecimal.valueOf(1024);
         b = b.divide(num, 2, BigDecimal.ROUND_HALF_UP).divide(num, 2, BigDecimal.ROUND_HALF_UP)
                 .setScale(2, BigDecimal.ROUND_HALF_UP);
 

sop-business/src/main/resources/mapper/TBDelayWarnMapper.xml

@@ -18,7 +18,8 @@
         LEFT JOIN t_b_crm c ON c.crm_no = a.crm_no
         LEFT JOIN sys_custom sc ON sc.id = c.custom_id
         LEFT JOIN t_b_service s ON s.id = a.service_id
-        <where>
+        <where> 1 = 1
+            and IF(s.`status` = 'PUBLISH', 1 = 1, 1 <![CDATA[ <> ]]> 1)
             <if test="id != null and id != ''">
                 and a.id = #{id}
             </if>

sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -36,7 +36,8 @@
             sys_user su ON tbdio.user_id = su.id
                 LEFT JOIN
             sys_supplier ss ON sd.supplier_id = ss.id
-        <where>
+        <where> 1 = 1
+            and IF(tbs.`status` = 'PUBLISH', 1 = 1, 1 <![CDATA[ <> ]]> 1)
             <if test="serviceUnitId != null">
                 AND tbs.id = #{serviceUnitId}
             </if>

sop-business/src/main/resources/mapper/TBProjectExchangeMapper.xml

@@ -44,7 +44,8 @@
                  left join t_b_service tbs on tbs.id = tbc.service_id
                  left join sys_custom sc on sc.id = tbc.custom_id
                  left join sys_user su ON tbpe.create_id = su.id
-        <where>
+        <where> 1 = 1
+            and IF(tbs.`status` = 'PUBLISH', 1 = 1, 1 <![CDATA[ <> ]]> 1)
             <if test="serviceId != null and serviceId != ''">
                 and tbs.id = #{serviceId}
             </if>

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -134,7 +134,7 @@
                     </otherwise>
                 </choose>
             </if>
-                and tffa.status in ('START','DRAFT','AUDITING','REJECT','CANCEL','FINISH')
+                and IF(tbs.`status` = 'PUBLISH', tffa.status in ('START', 'DRAFT', 'AUDITING', 'REJECT', 'CANCEL', 'FINISH'), 1 <![CDATA[ <> ]]> 1)
             <!--and EXISTS(
             select t.* from(select cast(art.PROC_INST_ID_ as Decimal(24)) as flowId
             from

sop-business/src/main/resources/mapper/TBViolationMapper.xml

@@ -19,7 +19,8 @@
         LEFT JOIN t_b_crm c ON c.crm_no = a.crm_no
         LEFT JOIN sys_custom sc ON sc.id = c.custom_id
         LEFT JOIN t_b_service s ON s.id = a.service_id
-        <where>
+        <where> 1 = 1
+            and IF(s.`status` = 'PUBLISH', 1 = 1, 1 <![CDATA[ <> ]]> 1)
             <if test="userId != null and userId != ''">
                 and a.user_id = #{userId}
             </if>