新增 质量问题列表接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/QualityProblemDto.java

@@ -78,4 +78,48 @@ public class QualityProblemDto  extends BaseDto {
     @ApiModelProperty(value = "是否限期内整改（1是/0否）")
     private Boolean rectifyWithinTime;
 
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目地址
+     */
+    private String projectAddress;
+
+    /**
+     * 检验状态
+     */
+    private String stage;
+
+    /**
+     * 检验信息
+     */
+    private String targetInfo;
+
+    /**
+     * 检验单位id
+     */
+    private String verifyUnitId;
+    /**
+     * 检验单位名称
+     */
+    private String verifyUnitName;
+    /**
+     * 检验负责人id
+     */
+    private String chargerPersonId;
+   /**
+    * 检验负责人名称
+    */
+    private String chargerPersonName;
+    /**
+     * 检验员id
+     */
+    private String inspectorId;
+    /**
+     * 检验员名称
+     */
+    private String inspectorName;
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/QualityProblemMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 质量问题表 Mapper 接口
  *
@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface QualityProblemMapper extends BaseMapper<QualityProblem> {
 
+    IPage<QualityProblemDto> getItems(IPage<QualityProblemDto> page,QualityProblemDto qualityProblemDto);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IQualityProblemService.java

 package com.yeejoin.amos.boot.module.ugp.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
+
 /**
  * 质量问题表接口类
  *
@@ -9,4 +12,6 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
  */
 public interface IQualityProblemService {
 
+    IPage<QualityProblemDto> getItems(String current , String size,QualityProblemDto qualityProblemDto);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/QualityProblemMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper">
 
+    <select id="getItems" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto">
+        SELECT
+        qi.*,
+        up.`name` AS project_name,
+        up.address AS project_address,
+        uv.stage,
+        uv.target_info,
+        uv.verify_unit_id,
+        uv.charger_person_id,
+        uv.inspector_id
+        FROM
+        tz_ugp_quality_problem AS qi
+        LEFT JOIN tz_ugp_project AS up ON up.sequence_nbr = qi.project_id
+        LEFT JOIN tz_ugp_verify AS uv ON uv.sequence_nbr = qi.stage_verify_id
+        <where>
+            <if test="qualityProblemDto.projectName != '' and qualityProblemDto.projectName != null">
+                and up.`name` like concat("%",qualityProblemDto.projectName,"%")
+            </if>
+            <if test="qualityProblemDto.code != '' and qualityProblemDto.code != null">
+                and qi.`code` like concat("%",qualityProblemDto.code,"%")
+            </if>
+        </where>
+    </select>
+
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/QualityProblemController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Arrays;
 import java.util.List;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.QualityProblemServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -113,4 +120,15 @@ public class QualityProblemController extends BaseController {
 	public ResponseModel<List<QualityProblemDto>> selectForList() {
 	    return ResponseHelper.buildResponse(qualityProblemServiceImpl.queryForQualityProblemList());
 	}
+
+	/**
+	 * 列表分页查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/pageList", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+	public ResponseModel<IPage<QualityProblemDto>> getItems(String current, String size,QualityProblemDto qualityProblemDto){
+		return ResponseHelper.buildResponse(qualityProblemServiceImpl.getItems(current,size,qualityProblemDto));
+	}
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/QualityProblemServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IQualityProblemService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.QualityProblemDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +19,10 @@ import java.util.List;
  */
 @Service
 public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,QualityProblem,QualityProblemMapper> implements IQualityProblemService {
+
+    @Autowired
+    QualityProblemMapper qualityProblemMapper;
+
     /**
      * 分页查询
      */
@@ -30,4 +36,13 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
     public List<QualityProblemDto> queryForQualityProblemList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public IPage<QualityProblemDto> getItems(String current, String size,QualityProblemDto qualityProblemDto) {
+        IPage<QualityProblemDto> page = new Page<>();
+        page.setCurrent(Long.parseLong(current));
+        page.setSize(Long.parseLong(size));
+        qualityProblemMapper.getItems(page,qualityProblemDto);
+        return null;
+    }
 }
\ No newline at end of file