安装计划

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallDetailDto.java

@@ -1,5 +1,6 @@
 package com.zcxk.rmcp.api.dto.install;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +24,7 @@ public class InstallDetailDto {
     @ApiModelProperty(value="安装数")
     private Integer installNum;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="创建时间")
     private LocalDateTime createDate;
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/InstallPlanMapper.xml

@@ -300,12 +300,13 @@
     left join rmcp_area a2 on a2.id = rc.city
     left join rmcp_area a3 on a3.id = rc.region
     where rip.status = 1
-    <if test="condition.name != null and condition.name != ''">and 1 = 1</if>
+    <if test="condition.name != null and condition.name != ''">and rip.plan_name LIKE concat('%',#{condition.name},'%')</if>
     <if test="condition.companyOrgId != null">and rip.company_org_id = #{condition.companyOrgId}</if>
     <if test="condition.deptOrgId != null">and rip.dept_org_id = #{condition.deptOrgId}</if>
     <if test="condition.acceptStatus != null">and rip.accept_status = #{condition.acceptStatus}</if>
     <if test="condition.planStatus != null">and rip.plan_status = #{condition.planStatus}</if>
     <include refid="permissionCondition"/>
+    order by rip.create_date desc
   </select>
 
   <sql id="permissionCondition">

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/InstallController.java

@@ -89,7 +89,7 @@ public class InstallController {
     @PostMapping("allAccept")
     @ApiOperation(value = "全部验收")
     public AjaxMessage<Void> allAccept(
-            @Valid InstallQueryDto dto
+            @Valid @RequestBody(required = true) InstallQueryDto dto
     ){
         installListService.allAccept(dto);
         return AjaxMessage.success();
@@ -107,7 +107,7 @@ public class InstallController {
     @PostMapping("allDelete")
     @ApiOperation(value = "全部删除")
     public AjaxMessage<Void> allDelete(
-            @Valid InstallQueryDto dto
+            @Valid @RequestBody(required = true) InstallQueryDto dto
     ){
         installListService.allDelete(dto);
         return AjaxMessage.success();