护理技术档案部分优化

Signed-off-by: XU <2440975820@qq.com>

src/main/java/thyyxxk/webserver/controller/technologyArchives/HLTechnologyArchivesController.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.controller.technologyArchives;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -13,11 +14,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @ClassName technologyArchivesController
- * @Author hsh
- * @Date 2024/7/4 15:33
+ * @ClassName HLtechnologyArchivesController
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
- * @Description 技术档案管理
+ * @Description 护理技术档案管理
  **/
 @RestController
 @RequestMapping("/hltechnologyArchives")
@@ -30,6 +31,11 @@ public class HLTechnologyArchivesController {
         this.hlservice = hlservice;
     }
 
+    @GetMapping("/selectDictInfo")
+    public ResultVo<Map<String, Object>> selectDictInfo(){
+        return hlservice.selectDictInfo();
+    }
+
     @PostMapping("/saveTechnologyArchivesHLMain")
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHLMain(@RequestBody @Validated TechnologyArchivesHLMain hltam){
         return hlservice.saveTechnologyArchivesHLMain(hltam);
@@ -144,7 +150,7 @@ public class HLTechnologyArchivesController {
 
     //上传图片
     @PostMapping("/putHL4CertificateImage")
-    public ResultVo<Map<String, Object>> putHL4CertificateImage(@RequestBody MultipartFile file,@RequestParam("name") String name) {
+    public ResultVo<Map<String, Object>> putHL4CertificateImage(@RequestBody MultipartFile[] file,@RequestParam("name") String name) {
         return hlservice.putHL4CertificateImage(file,name);
     }
     @GetMapping("/setHL4Image")

src/main/java/thyyxxk/webserver/entity/ComplexSheetData.java

@@ -5,7 +5,13 @@ import lombok.Data;
 import java.util.List;
 import java.util.Map;
 
-
+/**
+ * @ClassName ComplexSheetData
+ * @Author XU
+ * @Date 2025/4/2
+ * @Version 1.0
+ * @Description 多表数据导出配置
+ **/
 @Data
 public class ComplexSheetData {
 

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL1.java

@@ -1,12 +1,15 @@
 package thyyxxk.webserver.entity.technologyArchives;
 
 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 lombok.Data;
 
 /**
- * @ClassName TechnologyArchiveshl1
+ * @ClassName TechnologyArchivesHL1
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 专业技术资格证书取得情况
  **/
@@ -22,5 +25,4 @@ public class TechnologyArchivesHL1 {
     private String issuingAuthority;  // 批准机关
     private String image; // 链接
     private String account; // 工号
-
 }

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL2.java

@@ -8,8 +8,8 @@ import lombok.Data;
 
 /**
  * @ClassName TechnologyArchivesHL2
- * @Author hsh
- * @Date 2024/7/11 10:28
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 工作经历
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL3.java

@@ -8,6 +8,8 @@ import lombok.Data;
 
 /**
  * @ClassName TechnologyArchivesHL3
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 学习经历
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL4.java

@@ -8,6 +8,8 @@ import lombok.Data;
 
 /**
  * @ClassName TechnologyArchivesHL4
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 培训经历
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL5.java

@@ -8,6 +8,8 @@ import lombok.Data;
 
 /**
  * @ClassName TechnologyArchivesHL5
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 轮科记录
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL6.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 /**
  * @ClassName TechnologyArchivesHL6
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 科室调动记录
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL7.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 /**
  * @ClassName TechnologyArchivesHL7
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 休假记录
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHL9.java

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * @ClassName TechnologyArchives9
- * @Author hsh
- * @Date 2024/7/15 10:23
+ * @ClassName TechnologyArchivesHL9
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 培训考试考核情况
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesHLMain.java

@@ -11,6 +11,8 @@ import java.io.Serializable;
 
 /**
  * @ClassName TechnologyArchivesHLMain
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 护理技术文档基本信息
  **/

src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesMultiVo.java

@@ -5,6 +5,9 @@ import lombok.Data;
 import java.util.List;
 
 /**
+ * @ClassName TechnologyArchivesMultiVo
+ * @Author XU
+ * @Date 2025/4/2
  * @Version 1.0
  * @Description 技术档案查询vo
  **/

src/main/java/thyyxxk/webserver/service/technologyArchives/HLTechnologyArchivesService.java

@@ -26,7 +26,10 @@ import java.util.*;
 
 /**
  * @ClassName HLTechnologyArchivesService
- * @Description 技术档案管理
+ * @Author XU
+ * @Date 2025/4/2
+ * @Version 1.0
+ * @Description 护理技术档案管理
  **/
 @Service
 @Slf4j
@@ -80,6 +83,8 @@ public class HLTechnologyArchivesService {
      * @param text 工号或者身份证号或姓名
      * @return TechnologyArchivesHLMain
      * @Description 根据工号或者身份证号或姓名查询护理档案基本信息
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<TechnologyArchivesHLMain> selectHLEmployeeInfo(String text) {
         if (StringUtil.notBlank(text) && text.length() >= 5) {
@@ -143,6 +148,8 @@ public class HLTechnologyArchivesService {
      * @param hltam 基本信息
      * @return map
      * @Description 更新护理文档基本信息
+     * @Author XU
+     * @Date 2025/4/2
      */
 
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHLMain(TechnologyArchivesHLMain hltam) {
@@ -174,6 +181,13 @@ public class HLTechnologyArchivesService {
     private boolean isProd;
     public String uploadUrl = "http://172.16.32.197:8077/upload";
 
+    /**
+     * @param socialNo  身份证号
+     * @return map
+     * @Description 根据身份证查询基本信息个人图片
+     * @Author XU
+     * @Date 2025/4/2
+     */
     //查找图片
     public ResultVo<Map<String, Object>> selectHLImage1(String socialNo) {
         Map<String, Object> map = new HashMap<>();
@@ -194,6 +208,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo  身份证号  url 图片链接
      * @Description 根据身份证号来保存上传图片
      * @return map
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> setHLImage(String url, String socialNo) {
         Map<String, Object> map = new HashMap<>();
@@ -207,6 +223,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return list
      * @Description 查询所有护理档案类人员主要信息(账号 ， 身份证号 ， 姓名)
+     * @Author XU
+     * @Date 2025/4/2
      */
 
     public ResultVo<List<Map<String, Object>>> selectTechnologyArchivesHLMainDict() {
@@ -217,6 +235,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL1
      * @Description 根据工号查询专业技术资格证书取得情况
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL1>> selectTechnologyArchivesHL1() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -224,7 +244,13 @@ public class HLTechnologyArchivesService {
         return ResultVoUtil.success(list);
     }
 
-    //查找图片
+    /**
+     * @param socialNo  身份证号  geTime 获取时间
+     * @Description 根据身份证号和获取时间来查询证书图片
+     * @return map
+     * @Author XU
+     * @Date 2025/4/2
+     */
     public ResultVo<Map<String, Object>> selectHL1Image(String socialNo, String getTime) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> imgMap = hl1Dao.selectHL1Image(socialNo, getTime);
@@ -236,6 +262,8 @@ public class HLTechnologyArchivesService {
      * @param hl1 专业技术资格证书取得情况
      * @return map
      * @Description 更新专业技术资格证书取得情况
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL1(TechnologyArchivesHL1 hl1) {
 
@@ -267,7 +295,13 @@ public class HLTechnologyArchivesService {
         }
     }
 
-    //职称证书图片
+    /**
+     * @param files 上传文件   title 证书名称
+     * @Description 上传图片
+     * @return map
+     * @Author XU
+     * @Date 2025/4/2
+     */
     public ResultVo<Map<String, Object>> putHL1CertificateImage(MultipartFile[] files, String title) {
         UserInfo user = redisLikeService.getUserInfoByToken();
         String code = user.getCodeRs();
@@ -286,6 +320,7 @@ public class HLTechnologyArchivesService {
      * @param socialNo  身份证号  getTime 批准时间 url 图片链接
      * @Description 根据身份证号, 批准时间来保存上传图片
      * @return map
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> setHL1Image(String socialNo, String getTime, String url) {
         Map<String, Object> map = new HashMap<>();
@@ -298,6 +333,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号 getTime 批准时间
      * @return map
      * @Description 根据身份证号, 批准时间删除专业技术资格证书取得情况
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL1ByCode(String socialNo, String getTime) {
         if (StringUtil.isBlank(socialNo) || StringUtil.isBlank(getTime)) {
@@ -320,6 +357,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL2 工作经历
      * @Description 查询工作经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL2>> selectTechnologyArchivesHL2() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -348,6 +387,8 @@ public class HLTechnologyArchivesService {
      * @param HL2
      * @return map
      * @Description 根据身份证号更新工作经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL2(TechnologyArchivesHL2 HL2) {
 
@@ -395,6 +436,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo  身份证号  id 序号 url 图片链接
      * @Description 根据身份证号, 序号来保存上传图片
      * @return map
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> setHL2Image(String socialNo, String beginTime, String url) {
         Map<String, Object> map = new HashMap<>();
@@ -409,6 +452,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号  id
      * @return map
      * @Description 根据身份证号, id删除工作经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL2ByCode(String socialNo, Integer id) {
         if (StringUtil.isBlank(socialNo)) {
@@ -431,6 +476,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL3 学习经历
      * @Description 查询学习经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL3>> selectTechnologyArchivesHL3() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -442,6 +489,8 @@ public class HLTechnologyArchivesService {
      * @param HL3
      * @return map
      * @Description 根据身份证号更新学习经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL3(TechnologyArchivesHL3 HL3) {
 
@@ -489,6 +538,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号  id
      * @return map
      * @Description 根据身份证号, id删除学习经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL3ByCode(String socialNo, Integer id) {
         if (StringUtil.isBlank(socialNo)) {
@@ -511,6 +562,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL4 培训经历
      * @Description 查询培训经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL4>> selectTechnologyArchivesHL4() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -526,12 +579,17 @@ public class HLTechnologyArchivesService {
         return ResultVoUtil.success(map);
     }
 
-    public ResultVo<Map<String, Object>> putHL4CertificateImage(MultipartFile file,String name) {
+    public ResultVo<Map<String, Object>> putHL4CertificateImage(MultipartFile[] files,String name) {
         UserInfo user = redisLikeService.getUserInfoByToken();
         String code = user.getCodeRs();
         String uploadDir = "/uploadimage/hltechnology/trainingcertificateImage/" + code + "/" + name;
         Map<String, Object> map = new HashMap<>();
-        map.put("data",archiveServer.uploadFile(file,uploadDir,!isProd));
+        List<String> urls = new ArrayList<>();
+        System.out.println(Arrays.toString(files));
+        for (MultipartFile file : files){
+            urls.add(archiveServer.uploadFile(file, uploadDir, !isProd).getPath());
+        }
+        map.put("urls",urls);
         return ResultVoUtil.success(map);
     }
 
@@ -539,6 +597,8 @@ public class HLTechnologyArchivesService {
      * @param HL4
      * @return map
      * @Description 根据身份证号更新培训经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL4(TechnologyArchivesHL4 HL4) {
 
@@ -586,12 +646,12 @@ public class HLTechnologyArchivesService {
      * @param socialNo  身份证号  id 序号 url 图片链接
      * @Description 根据身份证号, 序号来保存上传图片
      * @return map
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> setHL4Image(String socialNo, String beginTime, String url) {
         Map<String, Object> map = new HashMap<>();
-        String url1 = uploadUrl + url;
-        System.out.println(url1);
-        int imgMap = hl4Dao.updateHL4Image(socialNo, beginTime, url1);
+        int imgMap = hl4Dao.updateHL4Image(socialNo, beginTime, url);
         map.put("data", imgMap);
         return ResultVoUtil.success(map);
     }
@@ -600,6 +660,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号  id
      * @return map
      * @Description 根据身份证号, id删除培训经历
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL4ByCode(String socialNo, Integer id) {
         if (StringUtil.isBlank(socialNo)) {
@@ -623,6 +685,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL5 轮科记录
      * @Description 查询轮科记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL5>> selectTechnologyArchivesHL5() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -634,6 +698,8 @@ public class HLTechnologyArchivesService {
      * @param HL5
      * @return map
      * @Description 根据身份证号更新轮科记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL5(TechnologyArchivesHL5 HL5) {
 
@@ -681,6 +747,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号  id
      * @return map
      * @Description 根据身份证号, id删除轮科记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL5ByCode(String socialNo, Integer id) {
         if (StringUtil.isBlank(socialNo)) {
@@ -703,6 +771,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL6 科室调动记录
      * @Description 查询科室调动记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL6>> selectTechnologyArchivesHL6() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -714,6 +784,8 @@ public class HLTechnologyArchivesService {
      * @param HL6
      * @return map
      * @Description 根据身份证号更新科室调动记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL6(TechnologyArchivesHL6 HL6) {
 
@@ -761,6 +833,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号  id
      * @return map
      * @Description 根据身份证号, id删除科室调动记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL6ByCode(String socialNo, Integer id) {
         if (StringUtil.isBlank(socialNo)) {
@@ -783,6 +857,8 @@ public class HLTechnologyArchivesService {
     /**
      * @return TechnologyArchivesHL7 休假记录
      * @Description 查询休假记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<List<TechnologyArchivesHL7>> selectTechnologyArchivesHL7() {
         UserInfo user = redisLikeService.getUserInfoByToken();
@@ -815,6 +891,8 @@ public class HLTechnologyArchivesService {
      * @param HL7
      * @return map
      * @Description 根据身份证号更新休假记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> saveTechnologyArchivesHL7(TechnologyArchivesHL7 HL7) {
 
@@ -863,6 +941,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo  身份证号  approvalTime 批准时间 url 图片链接
      * @Description 根据身份证号, 批准时间来保存上传图片
      * @return map
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> setHL7Image(String socialNo, String approvalTime, String url) {
         Map<String, Object> map = new HashMap<>();
@@ -875,6 +955,8 @@ public class HLTechnologyArchivesService {
      * @param socialNo 身份证号  id
      * @return map
      * @Description 根据身份证号, id删除休假记录
+     * @Author XU
+     * @Date 2025/4/2
      */
     public ResultVo<Map<String, Object>> delTechnologyArchivesHL7ByCode(String socialNo, String approvalTime) {
         if (StringUtil.isBlank(socialNo)) {
@@ -1002,7 +1084,7 @@ public class HLTechnologyArchivesService {
     /**
      * @param vo (textType 文档类型 text 关键字)
      * @return map
-     * @Description 根据文档类型查询技术文档信息
+     * @Description 根据文档类型查询护理技术文档信息
      * @Author hsh
      * @Date 2024/8/7 16:30
      */
@@ -1180,7 +1262,13 @@ public class HLTechnologyArchivesService {
         }
         infoChild.setSort(o + 2);
     }
-
+    /**
+     * @param  exportVo (ExportTypes 文档类型 ExportNames 关键字)
+     * @return map
+     * @Description 导出所有护理档案的信息
+     * @Author XU
+     * @Date 2025/4/2
+     */
     public ResultVo<Map<String, Object>> exportMultiTechnologyArchives(HttpServletResponse response, TechnologyArchivesMultiVo exportVo) {
         Map<String, Object> map = new HashMap<>();
         List<ComplexSheetData> sheets = new ArrayList<>();