Merge branch 'wangdingyi' into 'dev'

标准库分页查询

See merge request !95

quality-review/src/main/java/com/ruoyi/domain/Standard.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 标准
  * @TableName t_standard
@@ -45,4 +47,16 @@ public class Standard {
     @ApiModelProperty("文件路径")
     private String file;
 
+    @ApiModelProperty("标准分类")
+    private String standardType;
+
+    @ApiModelProperty("标准状态")
+    private String standardStatus;
+
+    @ApiModelProperty("发布日期")
+    private Date releaseDate;
+
+    @ApiModelProperty("实施日期")
+    private Date implementationDate;
+
 }

quality-review/src/main/java/com/ruoyi/mapper/StandardMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface StandardMapper extends BaseMapper<Standard> {
 
     // 分页查询
-    List<Standard> findList(@Param("params") StandardListRequest request);
+    List<Standard> findList();
 
     // 根据id查询
     Standard findListById(@Param("id") Long Id);

quality-review/src/main/java/com/ruoyi/service/StandardService.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface StandardService extends IService<Standard> {
 
     // 分页查询
-    List<Standard> findList(StandardListRequest request);
+    List<Standard> findList();
 
     //根据id查询
     Standard findListById(Long id);

quality-review/src/main/java/com/ruoyi/service/impl/StandardServiceImpl.java

@@ -18,12 +18,12 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
 
     /**
      * 分页查询
-     * @param request
+     * @param
      * @return
      */
     @Override
-    public List<Standard> findList(StandardListRequest request) {
-        return standardMapper.findList(request);
+    public List<Standard> findList() {
+        return standardMapper.findList();
     }
 
     /**

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -97,6 +97,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         task.setTaskInitiator(initiator.getNickName());
         task.setTaskInitiatorDept(initiator.getDept().getDeptName());
         task.setTaskStatus(Task.TASK_STATUS_NEW);
+        task.setRunStatus(Task.RUN_STATUS_RUNNABLE);
         task.setLeaderId(leader.getUserId());
         task.setLeader(leader.getName());
         task.setCreateTime(new Date());

quality-review/src/main/java/com/ruoyi/web/StandardController.java

@@ -31,12 +31,12 @@ public class StandardController extends BaseController {
      * 分页查询
      * @return
      */
-    @ApiOperation("标准表分页查询")
+    @ApiOperation("标准库分页查询")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/findStandardList")
     public TableDataInfo<Standard> findList(@Validated @RequestBody StandardListRequest request) {
         startPage(request);
-        return getDataTable(standardService.findList(request));
+        return getDataTable(standardService.findList());
     }
 }

quality-review/src/main/java/com/ruoyi/web/request/StandardListRequest.java

@@ -8,16 +8,4 @@ import lombok.Data;
 @ApiModel(value = "StandardListRequest", description = "查询标准")
 @Data
 public class StandardListRequest extends PageDomain {
-
-    /**
-     * 标准名称
-     */
-    @ApiModelProperty("标准名称")
-    private String name;
-
-    /**
-     * 标准号
-     */
-    @ApiModelProperty("标准号")
-    private String standardNo;
 }

quality-review/src/main/resources/mapper/StandardMapper.xml

@@ -9,19 +9,15 @@
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
         <result property="file" column="file" jdbcType="VARCHAR"/>
+        <result property="standardType" column="standard_type" jdbcType="VARCHAR"/>
+        <result property="standardStatus" column="standard_status" jdbcType="VARCHAR"/>
+        <result property="releaseDate" column="release_date" jdbcType="TIMESTAMP"/>
+        <result property="implementationDate" column="implementation_date" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <select id="findList" parameterType="com.ruoyi.web.request.StandardListRequest" resultMap="BaseResultMap">
-        SELECT id, name, standard_no, file
+        SELECT id, name, standard_no, file,standard_type,standard_status,release_date,implementation_date
         FROM t_standard
-        <where>
-            <if test="params.name != null and params.name != ''">
-                and name like concat('%',#{params.name},'%')
-            </if>
-            <if test="params.standardNo != null and params.standardNo != ''">
-                and standard_no = #{params.standardNo}
-            </if>
-        </where>
     </select>
 
     <select id="findListById" resultMap="BaseResultMap">