fix

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

@@ -1,11 +1,14 @@
 package com.qmth.sop.server.api;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.TBViolationResult;
+import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBViolation;
+import com.qmth.sop.business.service.SysUserService;
 import com.qmth.sop.business.service.TBViolationService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.ViolationStatusEnum;
@@ -38,6 +41,8 @@ public class TBViolationController {
 
     @Resource
     TBViolationService tBViolationService;
+    @Resource
+    SysUserService sysUserService;
 
 
     @ApiOperation(value = "sop违规登记表查询接口")
@@ -103,9 +108,21 @@ public class TBViolationController {
     public Result getByCode(@ApiParam(value = "sop违规登记表code", required = true) @RequestParam String code) {
         return ResultUtil.ok(tBViolationService.getByCode(code));
     }
+    //获取创建者list
+    @ApiOperation(value = "获取创建者list")
+    @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());
+    }
 
+    @ApiOperation(value = "获取创建者list")
+    @RequestMapping(value = "/user/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "创建者list", response = SysUser.class)})
+    public Result getUserList() {
 
-
+        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/TBDelayWarnDetailServiceImpl.java

@@ -3,9 +3,12 @@ package com.qmth.sop.business.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.entity.SysUser;
+import com.qmth.sop.business.entity.TBDelayWarn;
 import com.qmth.sop.business.entity.TBDelayWarnDetail;
 import com.qmth.sop.business.mapper.TBDelayWarnDetailMapper;
 import com.qmth.sop.business.service.TBDelayWarnDetailService;
+import com.qmth.sop.business.service.TBDelayWarnService;
+import com.qmth.sop.common.enums.DelayWarnStatusEnum;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.FieldUniqueEnum;
 import com.qmth.sop.common.util.ResultUtil;
@@ -14,6 +17,7 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 
@@ -29,7 +33,8 @@ import java.util.Objects;
 @Service
 public class TBDelayWarnDetailServiceImpl extends ServiceImpl<TBDelayWarnDetailMapper, TBDelayWarnDetail> implements TBDelayWarnDetailService{
 
-
+		@Resource
+		TBDelayWarnService tBDelayWarnService;
 		/**
 		* 新增修改延期预警明细表
 		*
@@ -43,6 +48,11 @@ public class TBDelayWarnDetailServiceImpl extends ServiceImpl<TBDelayWarnDetailM
 				if (Objects.isNull(tBDelayWarnDetail.getId())) {// 新增
 					tBDelayWarnDetail.setCreateId(sysUser.getId());
 					tBDelayWarnDetail.setCreateTime(System.currentTimeMillis());
+					TBDelayWarn tbDelayWarn = tBDelayWarnService.getById(tBDelayWarnDetail.getDelayWarnId());
+					if(tbDelayWarn.getStatus()==DelayWarnStatusEnum.NOT_START) {
+						tbDelayWarn.setStatus(DelayWarnStatusEnum.FOLLOW);
+						tBDelayWarnService.saveTBDelayWarn(tbDelayWarn);
+					}
 				} else { // 修改
 					//tBDelayWarnDetail.updateInfo(sysUser.getId());
 				}

sop-business/src/main/resources/db/log/shudonghui_update_log.sql

@@ -319,4 +319,8 @@ VALUES
     ( 1052, '修改', 'Update', 'LINK', 5, 1, 'AUTH', '276', 1, 0, 1 );
 INSERT INTO `sys_privilege` ( `id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display` )
 VALUES
-    ( 1053, '禁用启用', 'Enable', 'LINK', 5, 2, 'AUTH', '272,1046', 1, 0, 1 );
+    ( 1053, '禁用启用', 'Enable', 'LINK', 5, 2, 'AUTH', '272,1046', 1, 0, 1 );
+
+--2023.10.16
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1054, '获取用户', '/api/admin/tb/violation/creator/list', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1055, '获取用户', '/api/admin/tb/violation/user/list', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);

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

@@ -43,12 +43,12 @@
             </if>
             <if test="startTime != null and startTime != '' ">
                 <![CDATA[
-               and a.warn_time >= #{startTime}
+               and a.create_time >= #{startTime}
                ]]>
             </if>
             <if test="endTime != null and endTime != ''">
                 <![CDATA[
-                and a.warn_time <= #{endTime}
+                and a.create_time <= #{endTime}
                 ]]>
             </if>
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">