Commit fd83a3e537304c75b7cfec2cd5967cbbe3a4cfa4
Merge remote-tracking branch 'origin/dev' into dev
Showing
3 changed files
with
5 additions
and
5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
| @@ -60,7 +60,7 @@ public class InspectionPlanCommitRespVO { | @@ -60,7 +60,7 @@ public class InspectionPlanCommitRespVO { | ||
| 60 | @Schema(description = "巡检照片") | 60 | @Schema(description = "巡检照片") |
| 61 | @ExcelProperty("巡检照片") | 61 | @ExcelProperty("巡检照片") |
| 62 | @TableField(typeHandler = StringListTypeHandler.class) | 62 | @TableField(typeHandler = StringListTypeHandler.class) |
| 63 | - private List<String> img; | 63 | + private List<String> imgList; |
| 64 | 64 | ||
| 65 | @Schema(description = "巡检结果: 1:正常;2:异常") | 65 | @Schema(description = "巡检结果: 1:正常;2:异常") |
| 66 | @ExcelProperty("巡检结果: 1:正常;2:异常") | 66 | @ExcelProperty("巡检结果: 1:正常;2:异常") |
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO"> | 6 | <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO"> |
| 7 | - <result property="img" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/> | 7 | + <result property="imgList" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/> |
| 8 | </resultMap> | 8 | </resultMap> |
| 9 | <!-- | 9 | <!-- |
| 10 | 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 | 10 | 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 |
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
| @@ -39,10 +39,10 @@ | @@ -39,10 +39,10 @@ | ||
| 39 | AND a.plan_no = c.plan_no | 39 | AND a.plan_no = c.plan_no |
| 40 | AND b.batch_no = c.batch_no | 40 | AND b.batch_no = c.batch_no |
| 41 | <if test="req.planNo != null and req.planNo !=''"> | 41 | <if test="req.planNo != null and req.planNo !=''"> |
| 42 | - and a.plan_no = #{req.planNo} | 42 | + and a.plan_no LIKE CONCAT('%', #{req.planNo},'%') |
| 43 | </if> | 43 | </if> |
| 44 | <if test="req.planName != null and req.planName !=''"> | 44 | <if test="req.planName != null and req.planName !=''"> |
| 45 | - and b.plan_name = #{req.planName} | 45 | + and b.plan_name LIKE CONCAT('%', #{req.planName},'%') |
| 46 | </if> | 46 | </if> |
| 47 | <if test="req.roadName != null and req.roadName !=''"> | 47 | <if test="req.roadName != null and req.roadName !=''"> |
| 48 | AND b.road_name LIKE CONCAT(#{req.roadName},'%') | 48 | AND b.road_name LIKE CONCAT(#{req.roadName},'%') |
| @@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
| 72 | <!-- AND c.role_name LIKE CONCAT(#{req.roleName},'%')--> | 72 | <!-- AND c.role_name LIKE CONCAT(#{req.roleName},'%')--> |
| 73 | <!-- </if>--> | 73 | <!-- </if>--> |
| 74 | <if test="req.userName != null and req.userName !=''"> | 74 | <if test="req.userName != null and req.userName !=''"> |
| 75 | - AND c.user_name LIKE CONCAT(#{req.userName},'%') | 75 | + AND c.user_name LIKE CONCAT('%', #{req.userName},'%') |
| 76 | </if> | 76 | </if> |
| 77 | <if test="req.finishTime != null"> | 77 | <if test="req.finishTime != null"> |
| 78 | AND DATE_FORMAT(c.finish_time, '%Y-%m-%d') = #{req.finishTime} | 78 | AND DATE_FORMAT(c.finish_time, '%Y-%m-%d') = #{req.finishTime} |