wangliang 1 vuosi sitten
vanhempi
commit
c854bbee95

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

@@ -61,7 +61,6 @@ public class TBViolationController {
             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TBViolationResult> resultIPage = tBViolationService.query(new Page<>(pageNumber, pageSize), serviceId, type, status, userId, custom, sopNo, createId, startTime, endTime);
-
         return ResultUtil.ok(resultIPage);
     }
 

+ 0 - 3
sop-api/src/main/java/com/qmth/sop/server/api/TBViolationDetailController.java

@@ -1,8 +1,6 @@
 package com.qmth.sop.server.api;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.service.TBViolationDetailService;
 import com.qmth.sop.common.annotation.OperationLog;
@@ -41,7 +39,6 @@ public class TBViolationDetailController {
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "违规明细表查询结果", response = TBViolationDetail.class)})
     public Result query(@ApiParam(value = "sop违规登记表id", required = true) @RequestParam long id) {
-
 //        List<TBViolationDetail> resultIPage = tBViolationDetailService.list(new QueryWrapper<TBViolationDetail>().lambda().eq(TBViolationDetail::getViolationId, id).orderByDesc(TBViolationDetail::getCreateTime));
         List<TBViolationDetail> resultIPage = tBViolationDetailService.listByViolationId(id);
         return ResultUtil.ok(resultIPage);

+ 2 - 3
sop-business/src/main/resources/mapper/TBDelayWarnMapper.xml

@@ -75,8 +75,7 @@
                 </choose>
             </if>
         </where>
-
-        ORDER BY a.create_time DESC
+        ORDER BY a.code DESC
     </select>
 
     <sql id="warnTaskListCommonSql">
@@ -141,7 +140,7 @@
 
     <select id="getWarnTaskList" resultType="com.qmth.sop.business.bean.result.WorkWarnResult">
         select t.* from
-        <include refid="warnTaskListCommonSql" />
+        <include refid="warnTaskListCommonSql" /> order by t.code desc
     </select>
 
     <select id="getWarnTaskListCount" resultType="java.lang.Integer">

+ 1 - 3
sop-business/src/main/resources/mapper/TBViolationMapper.xml

@@ -73,8 +73,7 @@
                 </choose>
             </if>
         </where>
-
-        ORDER BY a.create_time DESC
+        ORDER BY a.code DESC
     </select>
 
     <select id="getByCode" resultType="com.qmth.sop.business.bean.result.TBViolationResult">
@@ -99,7 +98,6 @@
                 and a.code = #{code}
             </if>
         </where>
-
         ORDER BY a.create_time DESC
     </select>
 </mapper>