修改质量控制

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

@@ -134,7 +134,7 @@ public class NormProductionController {
             }
         }
 
-        return BaseResponse.okData(null);
+        return BaseResponse.okData(new Page<>());
     }
 
     @GetMapping("/statistics/detail")
@@ -158,7 +158,7 @@ public class NormProductionController {
             Page<NormProduction.NormProductionDetail> rts = PageUtil.listConvertToPage(collect, pageQuery);
             return BaseResponse.okData(rts);
         }
-        return BaseResponse.okData(null);
+        return BaseResponse.okData(new Page<>());
     }
 
     @GetMapping("/total/production")

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

@@ -7,6 +7,7 @@ import cn.wise.sc.cement.business.model.vo.QualityDetailVo;
 import cn.wise.sc.cement.business.service.IEntrustService;
 import cn.wise.sc.cement.business.service.IQualityApplyService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -61,7 +62,7 @@ public class QualityController {
 
 			List<EntrustVo> records = baseResponse.getData().getRecords();
 			if (records.size() == 0) {
-				return BaseResponse.okData(null);
+				return BaseResponse.okData(new Page<>());
 			}
 			List<Integer> projectIds = records.stream().map(EntrustVo::getId).collect(Collectors.toList());
 			Set<Integer> qualityApplyIds = iQualityApplyService.selectQualityApplyStatusByProIds(projectIds);

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

 package cn.wise.sc.cement.business.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.wise.sc.cement.business.entity.Consumables;
+import cn.wise.sc.cement.business.entity.GroupStandard;
 import cn.wise.sc.cement.business.entity.Standard;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -181,5 +184,12 @@ public class StandardController {
     public BaseResponse<List<StandardValueVo>> getStandardDetailList() {
         return standardService.getStandardDetailList();
     }
+
+    @ApiOperation("按检测组获取标样信息")
+    @GetMapping("/list/byGroup")
+    public BaseResponse<List<GroupStandard>> getStandards() {
+
+        return BaseResponse.okData(standardService.getStandards());
+    }
 }
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/GroupStandard.java

+package cn.wise.sc.cement.business.entity;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @description: 标样值
+ * @author: qh
+ * @create: 2020-11-05 10:11
+ **/
+@Data
+public class GroupStandard implements Serializable {
+
+    private static final long serialVersionUID = 42L;
+
+    /**
+     * 检测组id
+     */
+    private String groupName;
+
+    /**
+     * 标准样品key:value
+     */
+    private Map<String, String> map;
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/NormProduction.java

@@ -40,9 +40,9 @@ public class NormProduction implements Serializable {
 	private Integer assessId;
 
 	/**
-	 * 类型  0:检测组  1:处理项
+	 * 类型  1:检测组  0:处理项
 	 */
-	@ApiModelProperty("类型  0:检测组  1:处理项")
+	@ApiModelProperty("类型  1:检测组  0:处理项")
 	private Integer type;
 
 	/**

cement-business/src/main/java/cn/wise/sc/cement/business/entity/StandardGroupDto.java

+package cn.wise.sc.cement.business.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: qh
+ * @create: 2020-11-05 11:02
+ **/
+@Data
+public class StandardGroupDto implements Serializable {
+    private String groupName;
+    private Integer groupId;
+    private String elementName;
+    private String elementValue;
+}
\ No newline at end of file

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

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Standard;
+import cn.wise.sc.cement.business.entity.StandardGroupDto;
 import cn.wise.sc.cement.business.model.vo.StandardValueVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,12 @@ public interface StandardMapper extends BaseMapper<Standard> {
 	List<StandardValueVo> getStandardDetaulList();
 
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
+
+	/**
+	 * @return
+	 *
+	 */
+	List<StandardGroupDto> getStandardsByGroup();
+
+
 }

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

@@ -43,5 +43,12 @@
         <include refid="where"/>
         ORDER BY t.id DESC
     </select>
+    <select id="getStandardsByGroup" resultType="cn.wise.sc.cement.business.entity.StandardGroupDto">
+         select s.id as group_id,s.`name` as group_name,sv.element_name,sv.element_value FROM standard  s
+        INNER JOIN
+        (SELECT * FROM standard_value) sv
+        ON s.id = sv.standard_id AND s.`status` = 1
+    </select>
+
 
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NormProductionVo.java

@@ -26,10 +26,10 @@ public class NormProductionVo {
 	private Integer assessId;
 
 	/**
-	 * 类型  0:检测组  1:处理项
+	 * 类型  1:检测组  0:处理项
 	 */
-	@ApiModelProperty("类型  0:检测组  1:处理项")
-	private Integer type;
+	@ApiModelProperty("类型  1:检测组  0:处理项")
+	private String type;
 
 	/**
 	 * 定额工日

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

 package cn.wise.sc.cement.business.service;
 
 import cn.wise.sc.cement.business.entity.EntityEnclosure;
+import cn.wise.sc.cement.business.entity.GroupStandard;
 import cn.wise.sc.cement.business.entity.Standard;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -46,4 +47,10 @@ public interface IStandardService extends IService<Standard> {
 	BaseResponse<String> overdue(Integer id);
 
 	BaseResponse<List<StandardValueVo>> getStandardDetailList();
+
+	/**
+	 * 按检测组获取标样信息
+	 * @return GroupStandard
+	 */
+    List<GroupStandard> getStandards();
 }

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

+package cn.wise.sc.cement.business.service.impl;
+
+import lombok.Data;
+
+/**
+ * @description: key:"",vale:""的映射对象
+ * @author: qh
+ * @create: 2020-11-05 10:47
+ **/
+@Data
+public class KeyValueMap {
+
+    private String name;
+
+    private String value;
+
+}

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

@@ -185,6 +185,11 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
                         .findFirst()
                         .ifPresent(opt -> normProductionVo.setAssessName(opt.getName()));
             }
+            if (arg.getType() == 1) {
+                normProductionVo.setType("检测项");
+            } else {
+                normProductionVo.setType("处理项");
+            }
             records.add(normProductionVo);
         });
         rts.setRecords(records);
@@ -436,7 +441,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
         //处理非标准产值没有用名职位信息
         QueryWrapper<SysUser> qw = new QueryWrapper<>();
         qw.in("id", userIds);
-        if(CollectionUtil.isEmpty(userIds)){
+        if (CollectionUtil.isEmpty(userIds)) {
             return null;
         }
         List<SysUser> users = iSysUserService.list(qw);

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

@@ -11,12 +11,11 @@ import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.*;
 import cn.wise.sc.cement.business.model.vo.StandardValueVo;
 import cn.wise.sc.cement.business.model.vo.StandardVo;
-import cn.wise.sc.cement.business.service.IStandardEnterService;
 import cn.wise.sc.cement.business.service.IStandardService;
 import cn.wise.sc.cement.business.service.IStandardValueService;
 import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
-import cn.wise.sc.cement.business.wrapper.page.Query;
+import cn.wise.sc.cement.business.util.ObjUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,8 +33,10 @@ import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -411,4 +412,46 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         }
     }
 
+    @Override
+    public List<GroupStandard> getStandards() {
+
+        List<StandardGroupDto> list = standardMapper.getStandardsByGroup();
+        List<GroupStandard> rts = new ArrayList<>(list.size());
+        Set<Integer> standardIds = new HashSet<>();
+        for (StandardGroupDto tmp : list) {
+            if (!standardIds.contains(tmp.getGroupId())) {
+                standardIds.add(tmp.getGroupId());
+                GroupStandard groupStandard = new GroupStandard();
+                groupStandard.setGroupName(tmp.getGroupName());
+                Map<String, String> map = new HashMap<>();
+                List<KeyValueMap> keyValueMaps = ObjUtils.str2Obj(tmp.getElementValue());
+                keyValueMaps
+                        .stream()
+                        .filter(arg -> "标准值".equals(arg.getName()))
+                        .findFirst()
+                        .ifPresent(arg -> {
+                            map.put(tmp.getElementName(), arg.getValue());
+                        });
+                groupStandard.setMap(map);
+                rts.add(groupStandard);
+            } else {
+                //根据groupName找到标准值
+                rts.stream()
+                        .filter(arg -> arg.getGroupName().equals(tmp.getGroupName()))
+                        .findFirst()
+                        .ifPresent(arg -> {
+                            List<KeyValueMap> keyValueMaps = ObjUtils.str2Obj(tmp.getElementValue());
+                            //将新的标准添加到map
+                            keyValueMaps
+                                    .stream()
+                                    .filter(opt -> "标准值".equals(opt.getName()))
+                                    .findFirst()
+                                    .ifPresent(opt -> arg.getMap().put(tmp.getElementName(), opt.getValue()));
+                        });
+            }
+        }
+
+        return rts;
+    }
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/util/ObjUtils.java

+package cn.wise.sc.cement.business.util;
+
+import cn.hutool.core.lang.Assert;
+import cn.wise.sc.cement.business.service.impl.KeyValueMap;
+import com.alibaba.fastjson.JSON;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: qh
+ * @create: 2020-11-05 10:48
+ **/
+public class ObjUtils {
+
+    public static List<KeyValueMap> str2Obj(String str){
+        Assert.notBlank(str,"带解析字符串不允许为空！");
+
+        return JSON.parseArray(str, KeyValueMap.class);
+    }
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/util/PageUtil.java

@@ -15,7 +15,7 @@ public class PageUtil {
 
 	public static <T> Page<T> listConvertToPage(List<T> list, PageQuery pageQuery) {
 		if (CollectionUtil.isEmpty(list)){
-			return null;
+			return new Page<>();
 		}
 		int start = pageQuery.getPageNo() > 0 ? pageQuery.getPageNo() : 1;
 		int pageSize = pageQuery.getPageSize() > 0 ? pageQuery.getPageSize() : 10;