Merge branch 'master' into 'master'

技术档案Ⅱ优化

See merge request lighter/web-server!101

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

@@ -305,4 +305,9 @@ public class TechnologyArchivesController {
         return service.exportTechnologyArchivesInfo(response, vo);
     }
 
+    @GetMapping("/selectTechnologyArchivesMainDict")
+    public ResultVo<List<Map<String, Object>>> selectTechnologyArchivesMainDict(){
+        return service.selectTechnologyArchivesMainDict();
+    }
+
 }

src/main/java/thyyxxk/webserver/dao/his/technologyArchives/TechnologyArchives11Dao.java

@@ -32,6 +32,12 @@ public interface TechnologyArchives11Dao extends BaseMapper<TechnologyArchives11
             "<if test=\"socialNo != null and socialNo != '' \">" +
             "social_no = #{socialNo}, " +
             "</if>" +
+            "<if test=\"accountAuthor != null and accountAuthor != '' \">" +
+            "account_author = #{accountAuthor}, " +
+            "</if>" +
+            "<if test=\"accountName != null and accountName != '' \">" +
+            "account_name = #{accountName}, " +
+            "</if>" +
             "<if test=\"id != null and id != '' \">" +
             "id = #{id}, " +
             "</if>" +

src/main/java/thyyxxk/webserver/dao/his/technologyArchives/TechnologyArchives15Dao.java

@@ -32,6 +32,12 @@ public interface TechnologyArchives15Dao extends BaseMapper<TechnologyArchives15
             "<if test=\"socialNo != null and socialNo != '' \">" +
             "social_no = #{socialNo}, " +
             "</if>" +
+            "<if test=\"accountAuthor != null and accountAuthor != '' \">" +
+            "account_author = #{accountAuthor}, " +
+            "</if>" +
+            "<if test=\"accountName != null and accountName != '' \">" +
+            "account_name = #{accountName}, " +
+            "</if>" +
             "<if test=\"id != null and id != '' \">" +
             "id = #{id}, " +
             "</if>" +

src/main/java/thyyxxk/webserver/dao/his/technologyArchives/TechnologyArchives8Dao.java

@@ -32,6 +32,12 @@ public interface TechnologyArchives8Dao extends BaseMapper<TechnologyArchives8>
             "<if test=\"socialNo != null and socialNo != '' \">" +
             "social_no = #{socialNo}, " +
             "</if>" +
+            "<if test=\"accountAuthor != null and accountAuthor != '' \">" +
+            "account_author = #{accountAuthor}, " +
+            "</if>" +
+            "<if test=\"accountName != null and accountName != '' \">" +
+            "account_name = #{accountName}, " +
+            "</if>" +
             "<if test=\"id != null and id != '' \">" +
             "id = #{id}, " +
             "</if>" +

src/main/java/thyyxxk/webserver/dao/his/technologyArchives/TechnologyArchivesMainDao.java

@@ -7,6 +7,9 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.entity.technologyArchives.TechnologyArchivesMain;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface TechnologyArchivesMainDao extends BaseMapper<TechnologyArchivesMain> {
 
@@ -86,4 +89,8 @@ public interface TechnologyArchivesMainDao extends BaseMapper<TechnologyArchives
             "where social_no = #{socialNo} " +
             "</script>")
     int updateTechnologyArchivesMainBySocialNo(TechnologyArchivesMain main);
+
+    @Select(" select account as accountAuthor, social_no as socialNo, name as accountName from technology_archives_main ")
+    List<Map<String, Object>> selectTechnologyArchivesMainDict();
+
 }

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

@@ -24,6 +24,8 @@ public class TechnologyArchives11 {
     private String record; // 事件性质
     private String comment; // 情况摘要
     private String account; // 工号
+    private String accountAuthor; //被授权人工号
+    private String accountName; //被授权人姓名
     @TableField(exist = false)
     private String oldSocialNo; // 修改前身份证号
 

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

@@ -25,7 +25,9 @@ public class TechnologyArchives15 {
     private String content; // 权限内容
     private String delFlag; // 权限资格(0: 授予  1: 除去)
     private String comment; // 备注
-    private String account; // 工号
+    private String account; // 授权人工号
+    private String accountAuthor; //被授权人工号
+    private String accountName; //被授权人姓名
     @TableField(exist = false)
     private String oldSocialNo; // 修改前身份证号
 

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

@@ -27,6 +27,8 @@ public class TechnologyArchives8 {
     private String delFlag; // 权限资格(0: 授予  1: 除去)
     private String comment; // 备注
     private String account; // 工号
+    private String accountAuthor; //被授权人工号
+    private String accountName; //被授权人姓名
     @TableField(exist = false)
     private String oldSocialNo; // 修改前身份证号
 

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

@@ -1683,5 +1683,15 @@ public class TechnologyArchivesService {
         return ResultVoUtil.success(map);
     }
 
+    /**
+     * @Description 查询所有技术档案Ⅰ类人员主要信息(账号， 身份证号， 姓名)
+     * @Author hsh
+     * @return list
+     * @Date 2024/8/12 16:19
+     */
+    public ResultVo<List<Map<String, Object>>> selectTechnologyArchivesMainDict(){
+        List<Map<String, Object>> list = mainDao.selectTechnologyArchivesMainDict();
+        return ResultVoUtil.success(list);
+    }
 
 }