委托审批状态规定： 0未审批，1已通过，2未通过

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

@@ -39,7 +39,7 @@ public class EntrustController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "status", value = "状态(0未审批，1未通过，2已通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "status", value = "状态(0未审批，1已通过，2未通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String")
 	})
@@ -103,7 +103,7 @@ public class EntrustController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "status", value = "状态(0未审批，1未通过，2已通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "status", value = "状态(0未审批，1已通过，2未通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String")
 	})
@@ -154,7 +154,7 @@ public class EntrustController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "status", value = "状态(0未审批，1未通过，2已通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "status", value = "状态(0未审批，1已通过，2未通过，3样品处理，4派发)", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String")
 	})

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -28,8 +28,8 @@
         (
         CASE e.status
         WHEN 0 THEN '未审批'
-        WHEN 1 THEN '未通过'
-        ELSE '已通过'
+        WHEN 1 THEN '已通过'
+        ELSE '未通过'
         END
         ) as statusValue
         from entrust e
@@ -43,9 +43,6 @@
     <select id="getDetail" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
         select e.*, p.name as projectName, c.name as clientName, su.name  as userName,
         su.phone as userPhone, su.fax as userFax
-
-
-
         from entrust e
         left join project p on p.id = e.project_id
         left join client c on c.id = e.client_id

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleQuery.java

@@ -28,7 +28,7 @@ public class SampleQuery {
 	private String sampleForm;
 
 	@ApiModelProperty("检测项id 例子：1、2、3")
-	private String 样品表d;
+	private String teamIds;
 
 	@ApiModelProperty("样品照片")
 	private String samplePhoto;

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysLogsServiceImpl.java

@@ -48,6 +48,7 @@ public class SysLogsServiceImpl extends ServiceImpl<SysLogsMapper, SysLogs> impl
 	 * @param objId
 	 * @return
 	 */
+	@Override
 	public BaseResponse<IPage<LogVo>> getPage(PageQuery pageQuery, String startDate, String endDate, Integer objType, Integer objId) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("startDate", startDate);