From 8267cbdb4dc96787e245a794f7ec6b4cadf7d532 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 16:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentLimsServiceImpl.java | 86 ++++++++++
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java | 44 +----
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 12 -
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 7
user-server/src/main/java/com/yuanchu/mom/dto/UserPageDto.java | 2
user-server/src/main/resources/mapper/UserMapper.xml | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java | 53 ++++--
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 9
cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java | 12 -
cnas-server/src/main/resources/mapper/DepartmentLimsMapper.xml | 34 ++++
cnas-server/src/main/java/com/yuanchu/mom/pojo/DepartmentLims.java | 38 ++++
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 15 +
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 1
cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentLimsMapper.java | 27 +++
cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java | 11 -
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 4
inspect-server/src/main/resources/static/report-template.docx | 0
cnas-server/src/main/resources/mapper/DepartmentMapper.xml | 11 -
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 35 +++-
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java | 2
cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentLimsService.java | 25 +++
21 files changed, 316 insertions(+), 114 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 7f4579b..9efef9b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -1,23 +1,19 @@
package com.yuanchu.mom.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.pojo.Department;
+import com.yuanchu.mom.pojo.DepartmentLims;
+import com.yuanchu.mom.service.DepartmentLimsService;
import com.yuanchu.mom.service.DepartmentService;
-import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
-
/**
* <p>
- * 閮ㄩ棬鏄庣粏 鍓嶇鎺у埗鍣�
+ * 缁勭粐鏋舵瀯鏄庣粏 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -29,32 +25,47 @@
@RequestMapping("/department")
public class DepartmentController {
- DepartmentService departmentService;
- @ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "娣诲姞閮ㄩ棬")
+ private DepartmentService departmentService;
+
+ private DepartmentLimsService departmentLimsService;
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "娣诲姞缁勭粐鏋舵瀯")
@PostMapping("/addDepartment")
public Result addDepartment(@RequestBody Department department) {
return Result.success(departmentService.addDepartment(department));
}
- @ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
+ @ApiOperation(value = "鑾峰彇缁勭粐鏋舵瀯鏍�")
@GetMapping("/selectDepartment")
- @ValueClassify("浜哄憳鏄庣粏")
+ @ValueClassify("鐢ㄦ埛绠＄悊")
public Result selectDepartment() {
return Result.success(departmentService.selectDepartment());
}
- @ValueClassify("浜哄憳鏄庣粏")
- @ApiOperation(value = "鍒犻櫎閮ㄩ棬")
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鍒犻櫎缁勭粐鏋舵瀯")
@PostMapping("/delDepartment")
public Result delDepartment(Integer id) {
return Result.success(departmentService.delDepartment(id));
}
- @ValueAuth
- @ApiOperation(value = "鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
- @PostMapping("/showUserById")
- public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- UserDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserDto.class);
- return Result.success(departmentService.showUserById(page, user));
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @ApiOperation(value = "鑾峰彇缁勭粐鏋舵瀯鏍�")
+ @GetMapping("/selectDepartmentLim")
+ public Result selectDepartmentLim() {
+ return Result.success(departmentLimsService.selectDepartment());
}
+ @ValueClassify("浜哄憳鏄庣粏")
+ @ApiOperation(value = "娣诲姞缁勭粐鏋舵瀯")
+ @PostMapping("/addDepartmentLims")
+ public Result addDepartmentLims(@RequestBody DepartmentLims department) {
+ return Result.success(departmentLimsService.addDepartment(department));
+ }
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @ApiOperation(value = "鍒犻櫎缁勭粐鏋舵瀯")
+ @PostMapping("/delDepartmentLims")
+ public Result delDepartmentLims(Integer id) {
+ return Result.success(departmentLimsService.delDepartment(id));
+ }
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentLimsMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentLimsMapper.java
new file mode 100644
index 0000000..a702511
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentLimsMapper.java
@@ -0,0 +1,27 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.pojo.DepartmentLims;
+
+import java.util.List;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恉epartment_lims(閮ㄩ棬鏄庣粏)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-05-22 14:08:17
+* @Entity com.yuanchu.mom.pojo.DepartmentLims
+*/
+public interface DepartmentLimsMapper extends BaseMapper<DepartmentLims> {
+
+ //鑾峰彇閮ㄩ棬鏍�
+ List<DepartmentDto> selectDepartment();
+
+ //鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
+ List<Integer> selectSonById(Integer id);
+
+}
+
+
+
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
index f38205a..53a0e62 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
@@ -1,12 +1,8 @@
package com.yuanchu.mom.mapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.dto.DepartmentDto;
-import com.yuanchu.mom.dto.UserDto;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.Department;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,15 +14,11 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2024-04-15 04:01:48
*/
-public interface DepartmentMapper extends BaseMapper<Department> {
+public interface DepartmentMapper extends MyBaseMapper<Department> {
//鑾峰彇閮ㄩ棬鏍�
List<DepartmentDto> selectDepartment();
-
- //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
- IPage<UserDto> showUserById(@Param("page") IPage<UserDto> page, @Param("ids") List<String> ids, @Param("ew") QueryWrapper<UserDto> ew);
-
//鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
List<Integer> selectSonById(Integer id);
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DepartmentLims.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DepartmentLims.java
new file mode 100644
index 0000000..a44d27b
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DepartmentLims.java
@@ -0,0 +1,38 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 閮ㄩ棬鏄庣粏
+ * @TableName department_lims
+ */
+@TableName(value ="department_lims")
+@Data
+public class DepartmentLims implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("鐖剁骇id")
+ private Integer fatherId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
\ No newline at end of file
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentLimsService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentLimsService.java
new file mode 100644
index 0000000..249c243
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentLimsService.java
@@ -0,0 +1,25 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.pojo.DepartmentLims;
+
+import java.util.List;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恉epartment_lims(閮ㄩ棬鏄庣粏)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-05-22 14:08:17
+*/
+public interface DepartmentLimsService extends IService<DepartmentLims> {
+
+ //娣诲姞閮ㄩ棬
+ int addDepartment(DepartmentLims departmentLims);
+
+ //鑾峰彇閮ㄩ棬鏍�
+ List<DepartmentDto> selectDepartment();
+
+ //鍒犻櫎閮ㄩ棬
+ boolean delDepartment(Integer id);
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java
index a956618..2b6e5bb 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DepartmentService.java
@@ -1,14 +1,10 @@
package com.yuanchu.mom.service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.DepartmentDto;
-import com.yuanchu.mom.dto.UserDto;
-import com.yuanchu.mom.pojo.Department;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.pojo.Department;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -28,7 +24,4 @@
//鍒犻櫎閮ㄩ棬
boolean delDepartment(Integer id);
-
- //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
- Map<String, Object> showUserById(Page page, UserDto user);
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentLimsServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentLimsServiceImpl.java
new file mode 100644
index 0000000..730c872
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentLimsServiceImpl.java
@@ -0,0 +1,86 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.mapper.DepartmentLimsMapper;
+import com.yuanchu.mom.pojo.DepartmentLims;
+import com.yuanchu.mom.service.DepartmentLimsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+* @author z1292
+* @description 閽堝琛ㄣ�恉epartment_lims(閮ㄩ棬鏄庣粏)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-05-22 14:08:17
+*/
+@Service
+@AllArgsConstructor
+public class DepartmentLimsServiceImpl extends ServiceImpl<DepartmentLimsMapper, DepartmentLims>
+ implements DepartmentLimsService{
+
+ DepartmentLimsMapper departmentMapper;
+
+ @Override
+ public int addDepartment(DepartmentLims department) {
+ departmentMapper.insert(department);
+ return department.getId();
+ }
+
+ //鑾峰彇閮ㄩ棬鏍�
+ @Override
+ public List<DepartmentDto> selectDepartment() {
+ List<DepartmentDto> departments = departmentMapper.selectDepartment();
+ //鑾峰彇鐖惰妭鐐�
+ List<DepartmentDto> collect = departments.stream().filter(m -> m.getFatherId() == null).peek(
+ (m) -> m.setChildren(getChildren(m, departments))
+ ).collect(Collectors.toList());
+ return collect;
+ }
+
+ /**
+ * 閫掑綊鏌ヨ瀛愯妭鐐�
+ * @param root 鏍硅妭鐐�
+ * @param all 鎵�鏈夎妭鐐�
+ * @return 鏍硅妭鐐逛俊鎭�
+ */
+ private List<DepartmentDto> getChildren(DepartmentDto root, List<DepartmentDto> all) {
+ return all.stream().filter(m -> Objects.equals(m.getFatherId(), root.getId())).peek(
+ (m) -> m.setChildren(getChildren(m, all))
+ ).collect(Collectors.toList());
+ }
+
+ //鍒犻櫎閮ㄩ棬
+ @Override
+ public boolean delDepartment(Integer id) {
+ //鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
+ List<DepartmentLims> department = getDepartment(id);
+ return removeBatchByIds(department);
+ }
+
+ //鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
+ public List<DepartmentLims> getDepartment(Integer id) {
+ List<DepartmentLims> list = new ArrayList<>();
+ DepartmentLims depart = baseMapper.selectById(id);
+ list.add(depart);
+ List<DepartmentLims> departments = baseMapper.selectList(Wrappers.<DepartmentLims>lambdaQuery().eq(DepartmentLims::getFatherId, id));
+ if (ObjectUtils.isNotEmpty(departments)) {
+ list.addAll(departments);
+ for (DepartmentLims department : departments) {
+ list.addAll(getDepartment(department.getId()));
+ }
+ }
+ return list;
+ }
+
+}
+
+
+
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
index fa99cdf..53f8b46 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
@@ -2,30 +2,19 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.DepartmentDto;
-import com.yuanchu.mom.dto.UserDto;
-import com.yuanchu.mom.dto.UserPageDto;
-import com.yuanchu.mom.pojo.Department;
-import com.yuanchu.mom.mapper.DepartmentMapper;
-import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.User;
-import com.yuanchu.mom.service.DepartmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.mapper.DepartmentMapper;
+import com.yuanchu.mom.pojo.Department;
+import com.yuanchu.mom.service.DepartmentService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import lombok.var;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Wrapper;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -43,6 +32,8 @@
public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
DepartmentMapper departmentMapper;
+
+
//娣诲姞閮ㄩ棬
@@ -82,23 +73,6 @@
List<Department> department = getDepartment(id);
return removeBatchByIds(department);
}
-
- //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
- @Override
- public Map<String, Object> showUserById(Page page, UserDto user) {
- //鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
- List<Integer> list = departmentMapper.selectSonById(Integer.parseInt(user.getDepartId()));
- List<String> ids = list.stream()
- .map(Object::toString)
- //.collect(Collectors.joining(","));
- .collect(Collectors.toList());
- log.info(ids+"\n");
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(UserDto.class));
- map.put("body", departmentMapper.showUserById(page, ids, QueryWrappers.queryWrappers(user)));
- return map;
- }
-
//鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
public List<Department> getDepartment(Integer id) {
diff --git a/cnas-server/src/main/resources/mapper/DepartmentLimsMapper.xml b/cnas-server/src/main/resources/mapper/DepartmentLimsMapper.xml
new file mode 100644
index 0000000..dbf7e78
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/DepartmentLimsMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.DepartmentLimsMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.DepartmentLims">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="fatherId" column="father_id" jdbcType="INTEGER"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <select id="selectDepartment" resultType="com.yuanchu.mom.dto.DepartmentDto">
+ SELECT id, name, father_id
+ FROM department_lims
+ </select>
+
+ <select id="selectSonById" resultType="java.lang.Integer">
+ SELECT au.id
+ FROM (SELECT * FROM department_lims WHERE father_id IS NOT NULL) au,
+ (SELECT @father_id := #{id}) pd
+ WHERE FIND_IN_SET(father_id, @father_id) > 0
+ AND @father_id := concat(@father_id, ',', id)
+ UNION
+ SELECT id
+ FROM department_lims
+ WHERE id = #{id}
+ ORDER BY id
+ </select>
+</mapper>
diff --git a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
index f0a3326..ad9d0f4 100644
--- a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
@@ -6,17 +6,6 @@
FROM department
</select>
- <select id="showUserById" resultType="com.yuanchu.mom.dto.UserDto">
- select * from (select id, name, age, email, phone,depart_id
- from user where state=1 and SUBSTRING_INDEX(depart_id, ',', -1) in
- <foreach collection="ids" item="id" separator="," open="(" close=")">
- #{id}
- </foreach> ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-
<select id="selectSonById" resultType="java.lang.Integer">
SELECT au.id
FROM (SELECT * FROM department WHERE father_id IS NOT NULL) au,
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
index 869393d..b804794 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
@@ -61,7 +61,7 @@
/**
* 鐢ㄦ埛鍚�
*/
- @ValueTableShow(value = 9, name = "鐢ㄦ埛鍚�")
+ @ValueTableShow(value = 9, name = "妫�楠屼汉")
private String name;
@TableField(fill = FieldFill.INSERT)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 887f325..78ec60d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -410,8 +410,6 @@
delRSet.add(jo1.get("r") + "");
}
}
- } else {
- if ("鍙傛暟".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
}
}
for (int i = 0; i < temp.size(); i++) {
@@ -504,7 +502,6 @@
}
Style style = new Style();
style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
-// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
if (!((v.get("fc") + "").indexOf("rgb") > -1)) {
style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
} else {
@@ -512,13 +509,10 @@
}
textRenderData.setStyle(style);
text.add(textRenderData);
- if (i == temp.size() - 1) {
- TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
- rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
- rows.add(rowRenderData);
- text = new ArrayList<>();
- }
}
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+ rows.add(rowRenderData);
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(rows);
TableStyle tableStyle = new TableStyle();
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 0a1fc95..5514fe2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -12,6 +12,7 @@
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.SampleProductDto2;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderService;
@@ -81,7 +82,11 @@
for (InsProduct insProduct : insProducts) {
InsOrderState insOrderState = new InsOrderState();
insOrderState.setInsOrderId(orderId);
- insOrderState.setLaboratory(insProduct.getSonLaboratory());
+ try {
+ insOrderState.setLaboratory(insProduct.getSonLaboratory());
+ }catch (NullPointerException e){
+ throw new ErrorException("璇ユ楠屽崟鏈夋湭缁存姢瀹為獙瀹ょ殑妫�楠岄」鐩�");
+ }
insOrderState.setInsState(0);
insOrderStateMapper.insert(insOrderState);
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 5355d6b..4c67745 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -159,6 +159,7 @@
inspection_item from (select *,GROUP_CONCAT(inspection_item
SEPARATOR ',') inspection_item2 from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
+ where (i.state = 1 or i.state = 3 or i.state = 4)
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 56fcb57..7c4b147 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 507d143..7ad8f6e 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -181,4 +181,19 @@
public Result<?> upUserPassword(String oldPassword, String newPassWord){
return Result.success(userService.upUserPassword(oldPassword, newPassWord));
}
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @PostMapping("/upUserDepardLimsId")
+ @ApiOperation(value = "淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> upUserDepardLimsId(String ids, String id){
+ return Result.success(userService.upUserDepardLimsId(ids, id));
+ }
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @PostMapping("/delUserDepardLimsId")
+ @ApiOperation(value = "鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> delUserDepardLimsId(Integer id){
+ return Result.success(userService.delUserDepardLimsId(id));
+ }
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/UserPageDto.java b/user-server/src/main/java/com/yuanchu/mom/dto/UserPageDto.java
index 173f547..83b7f8a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/UserPageDto.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/UserPageDto.java
@@ -18,7 +18,7 @@
@ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
private String updateUserName;
- @ValueTableShow(1)
+ @ValueTableShow(3)
@ApiModelProperty(value = "瑙掕壊")
private String roleName;
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index be0c63e..bc8bf1a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -24,14 +24,14 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(1)
+ @ValueTableShow(2)
@ApiModelProperty(value = "璐﹀彿")
private String account;
@ApiModelProperty(value = "瀵嗙爜")
private String password;
- @ValueTableShow(2)
+ @ValueTableShow(1)
@ApiModelProperty(value = "濮撳悕")
private String name;
@@ -89,13 +89,11 @@
/**
* 绛惧悕鐓х墖鍦板潃
*/
- @ValueTableShow(value = 12,name = "绛惧悕鐓х墖鍦板潃")
private String signatureUrl;
/**
* 鑷韩鐓х墖鍦板潃
*/
- @ValueTableShow(value = 13,name = "鑷韩鐓х墖鍦板潃")
private String pictureUrl;
/**
@@ -104,4 +102,7 @@
@ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
private String departId;
+ @ApiModelProperty(value = "LIMS鍏宠仈鐨勯儴闂╥d")
+ private String departLimsId;
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index f35b724..1784a33 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -37,4 +37,8 @@
int addPersonUser(PersonDto personDto);
+ int upUserDepardLimsId(String ids, String id);
+
+ int delUserDepardLimsId(Integer id);
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index c9f0694..d8cc65f 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -21,6 +22,7 @@
import org.springframework.util.DigestUtils;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -77,13 +79,13 @@
@Override
public int updateUser(User user) {
- user.setDepartId("1,"+user.getDepartId());
+ user.setDepartId("1," + user.getDepartId());
return userMapper.updateById(user);
}
@Override
public int addUser(User user) {
- user.setDepartId("1,"+user.getDepartId());
+ user.setDepartId("1");
return userMapper.insert(user);
}
@@ -126,44 +128,44 @@
public int addPersonUser(PersonDto personDto) {
AtomicReference<String> departId = new AtomicReference<>("");
AtomicReference<String> companyName = new AtomicReference<>();
- personDto.getCompany().forEach(company->{
+ personDto.getCompany().forEach(company -> {
Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));
- if(BeanUtil.isEmpty(department)){
+ if (BeanUtil.isEmpty(department)) {
department = new Departments();
department.setName(company.getCompanyName());
department.setCompanyId(company.getCompanyId());
Departments department2 = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getParentCompanyId()));
- if(BeanUtil.isEmpty(department2)){
+ if (BeanUtil.isEmpty(department2)) {
department.setFatherId(1);
- }else{
+ } else {
department.setFatherId(department2.getId());
}
departmentsMapper.insert(department);
}
- departId.set(departId.get()+department.getId()+",");
+ departId.set(departId.get() + department.getId() + ",");
companyName.set(department.getName());
});
personDto.getPerson().forEach(person -> {
User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID()));
- if(BeanUtil.isEmpty(user)){
+ if (BeanUtil.isEmpty(user)) {
user = new User();
user.setName(person.getName());
user.setNameEn("not write");
user.setAccount(person.getEmployeeID());
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
- user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
+ user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
user.setDepartId(departId.get());
// user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
user.setCompany(companyName.get());
user.setAddress("鏈～鍐�");
userMapper.insert(user);
- }else{
+ } else {
user.setName(person.getName());
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
- user.setIsCustom(person.getCompanyId().equals("SC2463")?0:1);
+ user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
user.setDepartId(departId.get());
user.setCompany(companyName.get());
user.setCreateUser(null);
@@ -175,4 +177,15 @@
});
return 1;
}
+
+ @Override
+ public int upUserDepardLimsId(String ids, String id) {
+ List<Integer> userIds = JSON.parseArray(ids, Integer.class);
+ return userMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ }
+
+ @Override
+ public int delUserDepardLimsId(Integer id) {
+ return userMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ }
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index c9ac90a..4ce6510 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -6,7 +6,7 @@
select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
- u1.name_en
+ u1.name_en,u1.depart_lims_id
from user u1
left join user u2 on u2.id = u1.create_user
left join user u3 on u3.id = u1.update_user
--
Gitblit v1.9.3