From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 15:38:44 +0800
Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessReport.java | 92 ++++++++++++++++++
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 13 ++
inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java | 16 +++
inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java | 57 +++++++++++
user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java | 23 ++++
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 12 ++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 7 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 7 +
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 18 +++
user-server/src/main/resources/mapper/UserMapper.xml | 30 ++++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessOrder1Mapper.java | 16 +++
11 files changed, 291 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessOrder1Mapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessOrder1Mapper.java
new file mode 100644
index 0000000..e10e697
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessOrder1Mapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.mom.pojo.ProcessOrder;
+
+
+/**
+ * <p>
+ * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2024-11-05 03:06:20
+ */
+public interface ProcessOrder1Mapper extends BaseMapper<ProcessOrder> {
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
new file mode 100644
index 0000000..c797907
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/ProcessReportMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.mom.pojo.ProcessReport;
+
+/**
+ * <p>
+ * 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2024-11-05 08:58:39
+ */
+public interface ProcessReportMapper extends BaseMapper<ProcessReport> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java
new file mode 100644
index 0000000..7f3895f
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessOrder.java
@@ -0,0 +1,57 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2024-11-05 03:06:20
+ */
+@Getter
+@Setter
+@TableName("cnas_process_order")
+@ApiModel(value = "ProcessOrder瀵硅薄", description = "瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫")
+public class ProcessOrder extends OrderBy implements Serializable {
+
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍏宠仈澶栭敭(妫�楠屽崟id)")
+ private Integer insOrderId;
+
+ @ApiModelProperty("鍒ゅ畾瑙勫垯:涓嶈�冭檻涓嶇‘瀹氬害/鑰冭檻涓嶇‘瀹氬害(%)")
+ private String rule;
+
+ @ApiModelProperty("缁煎悎瀹ょ鍚嶄汉")
+ private Integer comprehensiveUser;
+
+ @TableField(select = false,exist = false)
+ private String comprehensiveUserUrl;
+
+ @ApiModelProperty("鎺ユ敹鏃ユ湡")
+ private LocalDate comprehensiveTime;
+
+ @ApiModelProperty("棰嗘牱鍛�")
+ private Integer issueUser;
+
+ @TableField(select = false,exist = false)
+ private String issueUserUrl;
+
+ @ApiModelProperty("棰嗘牱鏃ユ湡")
+ private LocalDate issueTime;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessReport.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessReport.java
new file mode 100644
index 0000000..8d35b01
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProcessReport.java
@@ -0,0 +1,92 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2024-11-05 08:58:39
+ */
+@Getter
+@Setter
+@TableName("cnas_process_report")
+@ApiModel(value = "ProcessReport瀵硅薄", description = "妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
+public class ProcessReport extends OrderBy implements Serializable {
+
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("妫�楠屾姤鍛婄紪鍙�")
+ @ValueTableShow(1)
+ private String insReportCode;
+
+ @ApiModelProperty("椤垫暟")
+ @ValueTableShow(2)
+ private String pages;
+
+ @ApiModelProperty("鍙戦�佷唤鏁�")
+ @ValueTableShow(3)
+ private String number;
+
+ @ApiModelProperty("鍙戝線浣曞")
+ @ValueTableShow(4)
+ private String send;
+
+ @ApiModelProperty("鍙戦�佹柟寮�")
+ @ValueTableShow(5)
+ private String method;
+
+ @ApiModelProperty("鍙戦�佹棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ValueTableShow(6)
+ private LocalDate sendTime;
+
+ @ApiModelProperty("鍙戦�佷汉")
+ private Integer sendUser;
+
+ @ValueTableShow(value = 7,name = "鍙戦�佷汉")
+ @TableField(select = false,exist = false)
+ private String sendUserName;
+
+ @ApiModelProperty("绛炬敹浜�")
+ private String signatory;
+
+
+ @TableField(select = false,exist = false)
+ private String signatoryUrl;
+
+ @ValueTableShow(value = 8,name = "绛炬敹浜�")
+ @TableField(select = false,exist = false)
+ private String signatoryName;
+
+ @ApiModelProperty("澶囨敞")
+ @ValueTableShow(9)
+ private String remark;
+
+ @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;
+}
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 0590eea..cd15ba1 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
@@ -96,6 +96,8 @@
CustomMapper customMapper;
@Resource
QYWXApi qywxApi;
+ @Resource
+ private ProcessOrder1Mapper processOrderMapper;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -395,6 +397,11 @@
//瀹℃牳閫氳繃鎵嶄細鐢熸垚濮旀墭缂栧彿
insOrder.setEntrustCode(giveCode.giveCode2("WT-", "ins_order", "-", "yyMMdd"));
insOrder.setSendTime(LocalDateTime.now());
+ /*瀹℃牳閫氳繃杩橀渶瑕佹柊澧炰竴鏉nas瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫*/
+ ProcessOrder processOrder = new ProcessOrder();
+ processOrder.setInsOrderId(insOrder.getId());
+ processOrder.setRule(insOrder.getRule());
+ processOrderMapper.insert(processOrder);
}
return insOrderMapper.updateById(insOrder);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 8a506b9..dbb5e93 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -85,6 +85,9 @@
@Resource
private InsReportMapper insReportMapper;
+ @Resource
+ ProcessReportMapper processReportMapper;
+
@Value("${wordUrl}")
private String wordUrl;
@@ -244,6 +247,10 @@
put("seal2", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
}}, finalUrl);
wordToPdf(finalUrl, sealUrl);
+ /*鏂板cnas7.8鎶ュ憡缁撴灉*/
+ ProcessReport processReport = new ProcessReport();
+ processReport.setInsReportCode(insReport.getCode());
+ processReportMapper.insert(processReport);
return insReportMapper.updateById(insReport);
}
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 dd6bf5b..0e34fed 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
@@ -220,4 +220,17 @@
return Result.success(customService.selectCustomEnum());
}
+ @ValueAuth
+ @GetMapping ("/selectUserDepartmentLimsName")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
+ public Result<?> selectUserDepartmentLimsName(){
+ return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
+ }
+
+ @ValueAuth
+ @GetMapping ("/selectDepartmentLimsUserList")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�")
+ public Result<?> selectDepartmentLimsUserList(){
+ return Result.success(userService.selectDepartmentLimsUserList());
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
index f033f56..fdd297a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
@@ -6,9 +6,11 @@
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@Repository
@@ -30,4 +32,25 @@
//鑾峰彇绯荤粺鐨勬煇涓鑹茬殑璐﹀彿
List<User> getUserByRole(String name);
+ /**
+ * 鑾峰彇鐢ㄦ埛閮ㄩ棬
+ * @param userId
+ * @return
+ */
+ String selectUserDepartmentLimsName(@Param("userId") Integer userId);
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @param userId
+ * @return
+ */
+ List<User> selectDepartmentLimsUserList(@Param("userId") Integer userId);
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛鍜岄儴闂�
+ * @param participant
+ * @return
+ */
+ List<Map<String, String>> selectNameAnddepartment(@Param("participant") String participant);
}
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 dbcad1a..e3bf187 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
@@ -43,4 +43,16 @@
int delUserDepardLimsId(Integer id);
List<User> getUser();
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ String selectUserDepartmentLimsName();
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @return
+ */
+ List<User> selectDepartmentLimsUserList();
}
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 f9545a8..e279621 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
@@ -198,4 +198,22 @@
public List<User> getUser() {
return userMapper.getUser();
}
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ @Override
+ public String selectUserDepartmentLimsName() {
+ return userMapper.selectUserDepartmentLimsName(getLook.selectPowerByMethodAndUserId(null).get("userId"));
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @return
+ */
+ @Override
+ public List<User> selectDepartmentLimsUserList() {
+ return userMapper.selectDepartmentLimsUserList(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 1ce5c16..d30538b 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -56,4 +56,34 @@
left join role r on u.role_id = r.id
where r.name=#{name}
</select>
+
+ <!-- 鑾峰彇鐢ㄦ埛閮ㄩ棬 -->
+ <select id="selectUserDepartmentLimsName" resultType="java.lang.String">
+ select dl.name
+ from user u
+ left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
+ where u.id = #{userId}
+ limit 1
+ </select>
+
+ <!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴� -->
+ <select id="selectDepartmentLimsUserList" resultType="com.yuanchu.mom.pojo.User">
+ select id,
+ account,
+ name,
+ name_en
+ from user u
+ where depart_lims_id = (select u2.depart_lims_id
+ from user u2
+ where u2.id = #{userId})
+ </select>
+
+ <!-- 鏌ヨ鐢ㄦ埛鍜岄儴闂� -->
+ <select id="selectNameAnddepartment" resultType="java.util.Map">
+ select u.name userName,
+ dl.name department
+ from user u
+ left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
+ where find_in_set(u.id, #{participant})
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3