BJ_FS / urbanops

Commit fd83a3e537304c75b7cfec2cd5967cbbe3a4cfa4

Authored by wangqian
2 parents 55f567fb b5fbe977

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
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
  View file @fd83a3e
... ... @@ -60,7 +60,7 @@ public class InspectionPlanCommitRespVO {
60 60 @Schema(description = "巡检照片")
61 61 @ExcelProperty("巡检照片")
62 62 @TableField(typeHandler = StringListTypeHandler.class)
63   - private List<String> img;
  63 + private List<String> imgList;
64 64  
65 65 @Schema(description = "巡检结果: 1:正常;2:异常")
66 66 @ExcelProperty("巡检结果: 1:正常;2:异常")
... ...
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
  View file @fd83a3e
... ... @@ -4,7 +4,7 @@
4 4  
5 5  
6 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 8 </resultMap>
9 9 <!--
10 10 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
... ...
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
  View file @fd83a3e
... ... @@ -39,10 +39,10 @@
39 39 AND a.plan_no = c.plan_no
40 40 AND b.batch_no = c.batch_no
41 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 43 </if>
44 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 46 </if>
47 47 <if test="req.roadName != null and req.roadName !=''">
48 48 AND b.road_name LIKE CONCAT(#{req.roadName},'%')
... ... @@ -72,7 +72,7 @@
72 72 <!-- AND c.role_name LIKE CONCAT(#{req.roleName},'%')-->
73 73 <!-- </if>-->
74 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 76 </if>
77 77 <if test="req.finishTime != null">
78 78 AND DATE_FORMAT(c.finish_time, '%Y-%m-%d') = #{req.finishTime}
... ...