修改

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/controller/MeterBaseOperationLogController.java

@@ -64,6 +64,23 @@ public class MeterBaseOperationLogController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseoperationlog:view")
+    @PostMapping(value = "/likeByDesc")
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas) {
+        try {
+            PageList<MeterBaseOperationLog> list = meterBaseOperationLogService.likeByDesc(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.java

@@ -14,6 +14,7 @@ import java.util.Map;
 public interface MeterBaseOperationLogMapper extends IBaseMapper<MeterBaseOperationLog, String> {
 
     List<MeterBaseOperationLog> doQueryAndMultiple(HashMap<String, Object> obj);
+    List<MeterBaseOperationLog> likeByDesc(HashMap<String, Object> obj);
 
     //根据时间查询所有秤点的结净匹配委托、撤销委托、结净已上传、结净未上传
     List<HashMap> countAllFirstState(Map<String, Object> params);

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.xml

@@ -716,4 +716,52 @@
       and  B.net_spot3_name like '%${baseSpotName}%'
     </if>
   </select>
+
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="createManNo != null and createManNo != ''">
+      and CREATE_MAN_NO LIKE '%${createManNo}%'
+    </if>
+    <if test="createManName != null and createManName != ''">
+      and CREATE_MAN_NAME LIKE '%${createManName}%'
+    </if>
+    <if test="updateManNo != null and updateManNo != ''">
+      and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+    </if>
+    <if test="updateManName != null and updateManName != ''">
+      and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+    </if>
+    <if test="operationPage != null and operationPage != ''">
+      and OPERATION_PAGE LIKE '%${operationPage}%'
+    </if>
+    <if test="operationFunction != null and operationFunction != ''">
+      and OPERATION_FUNCTION LIKE '%${operationFunction}%'
+    </if>
+    <if test="operationId != null and operationId != ''">
+      and OPERATION_ID LIKE '%${operationId}%'
+    </if>
+    <if test="operationPredictionNo != null and operationPredictionNo != ''">
+      and OPERATION_PREDICTION_NO LIKE '%${operationPredictionNo}%'
+    </if>
+    <if test="operationCarnNo != null and operationCarnNo != ''">
+      and OPERATION_CARN_NO LIKE '%${operationCarnNo}%'
+    </if>
+    <if test="operationBeforeFix != null and operationBeforeFix != ''">
+      and OPERATION_BEFORE_FIX LIKE '%${operationBeforeFix}%'
+    </if>
+    <if test="operationAfterFix != null and operationAfterFix != ''">
+      and OPERATION_AFTER_FIX LIKE '%${operationAfterFix}%'
+    </if>
+    <if test="logType != null and logType != ''">
+      and LOG_TYPE LIKE '%${logType}%'
+    </if>
+    <if test="logTypeCode != null and logTypeCode != ''">
+      and LOG_TYPE_CODE LIKE '%${logTypeCode}%'
+    </if>
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/service/IMeterBaseOperationLogService.java

@@ -25,6 +25,7 @@ import java.util.List;
 public interface IMeterBaseOperationLogService extends IBaseService<MeterBaseOperationLog, String>{
 
     List<MeterBaseOperationLog> addList(List<MeterBaseOperationLog> models);
+    PageList<MeterBaseOperationLog> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 
     int doAddLog(MeterBaseOperationLog model);
 

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/service/impl/MeterBaseOperationLogServiceImpl.java

@@ -72,6 +72,14 @@ public class MeterBaseOperationLogServiceImpl extends BaseServiceImpl<MeterBaseO
         }
     }
 
+    @Override
+    public PageList<MeterBaseOperationLog> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterBaseOperationLog> rows = meterBaseOperationLogMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public int doAddLog(MeterBaseOperationLog model) {
         try {