测试 修改检测项管理 处理项管理

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

@@ -6,6 +6,7 @@ import cn.wise.sc.cement.business.entity.TeamGroup;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.MethodQuery;
+import cn.wise.sc.cement.business.model.vo.HandleVo;
 import cn.wise.sc.cement.business.service.IHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -40,12 +41,13 @@ public class HandleController {
 
 	@ApiOperation(value = "处理项分页列表")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "name", value = "标准名称", paramType = "query", dataType = "String")
+			@ApiImplicitParam(name = "name", value = "处理项名称", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "userName", value = "处理人姓名", paramType = "query", dataType = "String")
 	})
 	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery, String name) {
+	public BaseResponse getPage(PageQuery pageQuery, String name, String userName) {
 		try {
-			return handleService.getPage(pageQuery, name);
+			return handleService.getPage(pageQuery, name, userName);
 		} catch (Exception e) {
 			log.debug("处理项分页列表{}", e);
 		}
@@ -56,11 +58,7 @@ public class HandleController {
 	@GetMapping("/{id}")
 	public BaseResponse getById(@PathVariable Integer id) {
 		try {
-			Handle e = handleService.getById(id);
-			if (e == null) {
-				return BaseResponse.errorMsg("信息错误!");
-			}
-			return BaseResponse.okData(e);
+			return handleService.getDetail(id);
 		} catch (Exception e) {
 			log.debug("处理项详情{}", e);
 		}
@@ -107,8 +105,7 @@ public class HandleController {
 	@PostMapping("/delete/{id}")
 	public BaseResponse delete(@PathVariable Integer id) {
 		try {
-			handleService.removeById(id);
-			return BaseResponse.okData("删除成功");
+			return handleService.delete(id);
 		} catch (Exception e) {
 			log.debug("删除处理项{}", e);
 		}

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

@@ -33,6 +33,11 @@ public class Handle implements Serializable {
 	 */
 	private String name;
 
+	/**
+	 * 处理人id
+	 */
+	private Integer userId;
+
 	/**
 	 * 创建时间
 	 */

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

@@ -49,8 +49,8 @@ public class Team extends BaseEntity implements Serializable {
 	@ApiModelProperty("收费标准")
 	private BigDecimal charge;
 
-	@ApiModelProperty("建议产值")
-	private BigDecimal proCharge;
+	/*@ApiModelProperty("建议产值")
+	private BigDecimal proCharge;*/
 
 	@ApiModelProperty("资质范围（1资质内，0资质外）")
 	private Integer qualifications;
@@ -67,4 +67,7 @@ public class Team extends BaseEntity implements Serializable {
 	@ApiModelProperty("备注")
 	private String remark;
 
+	@ApiModelProperty("处理项表id")
+	private Integer handleId;
+
 }

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

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Handle;
+import cn.wise.sc.cement.business.model.vo.ClientVo;
+import cn.wise.sc.cement.business.model.vo.HandleVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +21,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface HandleMapper extends BaseMapper<Handle> {
 
+
+	IPage<HandleVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
+	HandleVo getDetail(Integer id);
+
+	@Select("select count(*) from team t where t.handle_id = #{id}")
+	Integer countTeamByhandleId(@Param("id") Integer id);
+
+
+
+
 }

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

@@ -2,4 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.cement.business.mapper.HandleMapper">
 
+    <sql id="where">
+        <where>
+            <if test="params.name != null and params.name != ''">
+                and t.name like concat('%', #{params.name}, '%')
+            </if>
+            <if test="params.userName != null and params.userName != ''">
+                and su.name like concat('%', #{params.userName}, '%')
+            </if>
+        </where>
+    </sql>
+
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.HandleVo">
+        select t.*, su.name as userName
+        from handle t
+        left join sys_user su on su.id = t.user_id
+        <include refid="where"/>
+        order by t.create_time desc
+    </select>
+
+    <select id="getDetail" resultType="cn.wise.sc.cement.business.model.vo.HandleVo">
+        select t.*, su.name as userName
+        from handle t
+        left join sys_user su on su.id = t.user_id
+        where t.id = #{id}
+    </select>
+
+
+
+
+
+
+
+
+
 </mapper>

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

@@ -24,10 +24,12 @@
         WHEN 1 THEN '资质内'
         ELSE ''
         END
-        ) as qualificationsValue
+        ) as qualificationsValue,
+        h.name as handleName
         FROM team t
         left join team_group tg on tg.id = t.group_id
         left join method m on m.id = t.method_id
+        left join handle h on h.id = t.handle_id
         <include refid="where"/>
         ORDER BY t.id ASC
     </select>
@@ -73,10 +75,12 @@
         WHEN 1 THEN '资质范围内'
         ELSE ''
         END
-        ) as qualificationsValue
+        ) as qualificationsValue,
+        h.name as handleName
         FROM team t
         left join team_group tg on tg.id = t.group_id
         left join method m on m.id = t.method_id
+        left join handle h on h.id = t.handle_id
         where t.id = #{id}
     </select>
 

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

@@ -30,13 +30,13 @@ public class TeamQuery {
 	@ApiModelProperty("收费标准")
 	private BigDecimal charge;
 
-	@ApiModelProperty("建议产值")
-	private BigDecimal proCharge;
-
 	@ApiModelProperty("资质范围（1资质内，0资质外）")
 	private Integer qualifications;
 
 	@ApiModelProperty("是否可见 0:不可见 1:可见")
 	private Integer isDisplay;
 
+	@ApiModelProperty("处理项表id")
+	private Integer handleId;
+
 }

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

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-11-17
+ **/
+@Data
+@ApiModel("处理项Vo")
+public class HandleVo {
+
+	@ApiModelProperty("处理项id")
+	private Integer id;
+
+	@ApiModelProperty("样品处理项名称")
+	private String name;
+
+	@ApiModelProperty("处理人id")
+	private Integer userId;
+
+	@ApiModelProperty("处理人姓名")
+	private String userName;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+}

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

@@ -59,4 +59,11 @@ public class TeamVo {
 	@ApiModelProperty("委托是否可见 0:不可见 1:可见")
 	private Integer isDisplay;
 
+	@ApiModelProperty("处理项表id")
+	private Integer handleId;
+
+	@ApiModelProperty("处理项名称")
+	private String handleName;
+
+
 }

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

@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.service;
 import cn.wise.sc.cement.business.entity.Handle;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.HandleVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,10 +17,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IHandleService extends IService<Handle> {
 
-	BaseResponse<IPage<Handle>> getPage(PageQuery pageQuery, String name);
+	BaseResponse<IPage<HandleVo>> getPage(PageQuery pageQuery, String name, String userName);
+
+	BaseResponse<HandleVo> getDetail(Integer id);
 
 	BaseResponse<Handle> create(Handle query);
 
 	BaseResponse<Handle> update(Handle query);
 
+	BaseResponse<String> delete(Integer id);
+
 }

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

@@ -303,6 +303,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                         }
                     }
                 }
+                //如果为加急委托，产值是正常的3倍
+                if(entrust.getIsUrgent()==1){
+                    charge = charge.multiply(new BigDecimal(3));
+                }
                 sampleTmp.setEntrustId(entrust.getId())
                         .setCharge(charge)
                         .setCreateTime(LocalDateTime.now());

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

 package cn.wise.sc.cement.business.service.impl;
 
 import cn.wise.sc.cement.business.entity.Handle;
+import cn.wise.sc.cement.business.entity.SysRole;
 import cn.wise.sc.cement.business.entity.TeamGroup;
 import cn.wise.sc.cement.business.mapper.HandleMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.ClientVo;
+import cn.wise.sc.cement.business.model.vo.HandleVo;
 import cn.wise.sc.cement.business.service.IHandleService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,6 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,15 +44,27 @@ public class HandleServiceImpl extends ServiceImpl<HandleMapper, Handle> impleme
 	 * @return
 	 */
 	@Override
-	public BaseResponse<IPage<Handle>> getPage(PageQuery pageQuery, String name) {
-		QueryWrapper<Handle> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(name)) {
-			qw.like("name", name);
+	public BaseResponse<IPage<HandleVo>> getPage(PageQuery pageQuery, String name, String userName) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("name", name);
+		params.put("userName", userName);
+		Page<HandleVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<HandleVo> pages = handleMapper.getPage(page, params);
+		return BaseResponse.okData(pages);
 	}
-		qw.orderByDesc("create_time");
-		IPage<Handle> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-		page = handleMapper.selectPage(page, qw);
-		return BaseResponse.okData(page);
+
+	/**
+	 * 获取详情
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public BaseResponse<HandleVo> getDetail(Integer id) {
+		HandleVo handleVo = handleMapper.getDetail(id);
+		if(handleVo == null){
+			return BaseResponse.errorMsg("信息错误!");
+		}
+		return BaseResponse.okData(handleVo);
 	}
 
 	/**
@@ -85,6 +102,10 @@ public class HandleServiceImpl extends ServiceImpl<HandleMapper, Handle> impleme
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("处理项名称不能为空!");
 		}
+		Handle handle = handleMapper.selectById(query.getId());
+		if(handle == null){
+			return BaseResponse.errorMsg("信息错误!");
+		}
 		QueryWrapper<Handle> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		qw.ne("id", query.getId());
@@ -92,8 +113,32 @@ public class HandleServiceImpl extends ServiceImpl<HandleMapper, Handle> impleme
 		if (count > 0) {
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
-		handleMapper.updateById(query);
+		handle.setName(query.getName());
+		handle.setUserId(query.getUserId());
+		handle.setRemark(query.getRemark());
+		handleMapper.updateById(handle);
 		return BaseResponse.okData(query);
 	}
 
+	/**
+	 * 删除处理项
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<String> delete(Integer id) {
+		Handle handle = handleMapper.selectById(id);
+		if (handle == null) {
+			return BaseResponse.errorMsg("处理项不存在!");
+		}
+		Integer conunts = handleMapper.countTeamByhandleId(id);
+		if (conunts != 0 && conunts > 0) {
+			return BaseResponse.errorMsg(conunts + "个检测项正在使用!");
+		}
+		handleMapper.deleteById(id);
+		return BaseResponse.okData("删除成功");
+	}
+
+
 }

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

@@ -90,6 +90,10 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		if (query.getIsDisplay() != 1 && query.getIsDisplay() != 0) {
 			return BaseResponse.errorMsg("委托是否可见参数错误");
 		}
+		if (query.getHandleId() == null) {
+			return BaseResponse.errorMsg("请选择处理项");
+		}
+
 		QueryWrapper<Team> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = teamMapper.selectCount(qw);
@@ -121,6 +125,9 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		if (query.getMethodId() == null) {
 			return BaseResponse.errorMsg("请选择检依据");
 		}
+		if (query.getHandleId() == null) {
+			return BaseResponse.errorMsg("请选择处理项");
+		}
 		QueryWrapper<Team> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		qw.ne("id", query.getId());
@@ -130,9 +137,11 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 		}
 		update.setGroupId(query.getGroupId())
 				.setMethodId(query.getMethodId())
+				.setCharge(query.getCharge())
 				.setName(query.getName())
 				.setIsDisplay(query.getIsDisplay())
-				.setQualifications(query.getQualifications());
+				.setQualifications(query.getQualifications())
+				.setHandleId(query.getHandleId());
 		teamMapper.updateById(update);
 		return BaseResponse.okData(update);
 	}