Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

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

@@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.NonStandardValue;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
+import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
 import cn.wise.sc.cement.business.service.INonStandardValueService;
 import cn.wise.sc.cement.business.util.PageUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,10 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
@@ -92,6 +91,21 @@ public class NonStandardValueController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+//	@ApiOperation(value = "根据用户id查询指定非标产值信息")
+//	@GetMapping("/{userId}")
+//	public BaseResponse getByUserId(@PathVariable Integer userId) {
+//		try {
+//			BaseResponse<List<NonStandardValueVo>> e = inonStandardValueService.getByUserId(userId);
+//			if (e == null) {
+//				return BaseResponse.errorMsg("信息错误!");
+//			}
+//			return BaseResponse.okData(e);
+//		} catch (Exception e) {
+//			log.debug("通过用户id查询非标产值信息{}", e);
+//		}
+//		return BaseResponse.errorMsg("失败!");
+//	}
+
 	@ApiOperation("非标产值信息导出列表")
 	@PostMapping("/exportList")
 	public void exportList(String filename, Integer userId, String name, HttpServletResponse response) {

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/NonStandardValueMapper.java

@@ -24,4 +24,6 @@ public interface NonStandardValueMapper extends BaseMapper<NonStandardValue> {
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
 	List<NonStandardValueVo> getList(@Param("params") Map<String, Object> params);
+//
+//	List<NonStandardValueVo> getByUserId(@Param("params") Map<String, Object> params);
 }

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/NonStandardValueMapper.xml

@@ -44,6 +44,16 @@
         order by na.id asc
     </select>
 
+<!--    <select id="getByUserId" resultType="cn.wise.sc.cement.business.model.vo.NonStandardValueVo">-->
+<!--        select na.*,su.name as name,su.username as account,na.start_time as startTime,su.group_id as groups,sg.name as-->
+<!--        groupname-->
+<!--        from nonstandard_apply na-->
+<!--        LEFT JOIN sys_user su ON su.id = na.user_id-->
+<!--        LEFT JOIN sys_group sg ON sg.id = su.group_id-->
+<!--        <include refid="where"/>-->
+<!--        order by na.id asc-->
+<!--    </select>-->
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         na.id as 序号,

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/query/NonStandardApplyQuery.java

@@ -36,6 +36,6 @@ public class NonStandardApplyQuery {
 	@ApiModelProperty(name = "workDescription", value = "工作描述")
 	private String workDescription;
 
-	@ApiModelProperty(name = "userId", value = "用户id")
-	private Integer userId;
+/*	@ApiModelProperty(name = "userId", value = "用户id")
+	private Integer userId;*/
 }

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/INonStandardValueService.java

@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.service;
 import cn.wise.sc.cement.business.entity.NonStandardValue;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
 import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -35,6 +36,13 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
 	//计算每个用户提交的非标产值
 	BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups);
 
+//	/**
+//	 * 通过用户id查询非标产值信息
+//	 *
+//	 * @return List
+//	 */
+//	BaseResponse<List<NonStandardValueVo>> getByUserId(Integer userId);
+
 	/**
 	 * 获取所有非标产值信息
 	 *

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/NonStandardApplyServiceImpl.java

@@ -4,11 +4,13 @@ import cn.wise.sc.cement.business.entity.NonStandardApply;
 import cn.wise.sc.cement.business.entity.NonStandardApproval;
 import cn.wise.sc.cement.business.mapper.NonStandardApplyMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.NonStandardApplyQuery;
 import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
 import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
 import cn.wise.sc.cement.business.service.INonStandardApplyService;
+import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -41,6 +44,8 @@ import java.util.Map;
 public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMapper, NonStandardApply> implements INonStandardApplyService {
 	@Resource
 	private NonStandardApplyMapper nonStandardApplyMapper;
+	@Autowired
+	private ISysUserService userService;
 
 	@Override
 	public BaseResponse<IPage<NonStandardApplyVo>> getPage(PageQuery pageQuery, String name,Integer userId) {
@@ -68,12 +73,18 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 		return BaseResponse.okData(list);
 	}
 
+
 	@Override
 	@Transactional
 	public BaseResponse<NonStandardApply> create(NonStandardApplyQuery query) {
+		LoginUser loginUser = userService.getLoginUser();
+		if(loginUser==null){
+			return BaseResponse.errorMsg("请登录账号");
+		}
 		NonStandardApply cama = new NonStandardApply();
 		BeanUtils.copyProperties(query, cama);
 		cama.setStatistical(cama.getStartTime() + "/" + cama.getEndTime());
+		cama.setUserId(loginUser.getId());
 		nonStandardApplyMapper.insert(cama);
 		return BaseResponse.okData(cama);
 	}

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

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.NonStandardValue;
 import cn.wise.sc.cement.business.mapper.NonStandardValueMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
 import cn.wise.sc.cement.business.model.vo.NonStandardValueVo;
 import cn.wise.sc.cement.business.service.INonStandardValueService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
@@ -42,6 +43,19 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 		return BaseResponse.okData(pages);
 	}
 
+//	public BaseResponse<List<NonStandardValue>> userValue(Date start, Date end,Integer userId){
+//		List<NonStandardValueVo> data = getList(start, end, userId).getData();
+//		List<NonStandardValue> rts = new ArrayList<>();
+//		NonStandardValue finalNonStandardValue = new NonStandardValue();
+//		finalNonStandardValue.setFinalValue(0D);
+//		for (NonStandardValueVo nonStandardValueVo:data){
+//			Double newFinalValue = nonStandardValueVo.getFinalValue() + finalNonStandardValue.getFinalValue();
+//			finalNonStandardValue.setFinalValue(newFinalValue);
+//		}
+//		rts.add(finalNonStandardValue);
+//		return BaseResponse.okData(rts);
+//	}
+
 	@Override
 	//计算每个用户提交的非标产值
 	public BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups) {
@@ -105,6 +119,14 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 		return BaseResponse.okData(rts);
 	}
 
+//	@Override
+//	public BaseResponse<List<NonStandardValueVo>> getByUserId(Integer userId) {
+//		Map<String, Object> params = new HashMap<>();
+//		params.put("userId", userId);
+//		List<NonStandardValueVo> list = nonStandardValueMapper.getByUserId(params);
+//		return BaseResponse.okData(list);
+//	}
+
 	@Override
 	public BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups) {
 		Map<String, Object> params = new HashMap<>();

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;