Browse Source

档案管理保存

xiaof 2 years ago
parent
commit
6d8ff078e2

+ 2 - 0
paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesMapper.java

@@ -15,4 +15,6 @@ import org.apache.ibatis.annotations.Param;
 public interface PaperArchivesMapper extends BaseMapper<PaperArchives> {
 
     IPage<PaperArchivesResult> pageData(@Param("page") Page<PaperArchivesResult> page, @Param("semesterId") Long semesterId, @Param("managerOrgId") Long managerOrgId, @Param("archivesTypeId") Long archivesTypeId, @Param("archivesName") String archivesName);
+
+    PaperArchives selectByArchivesName(@Param("schoolId") Long schoolId, @Param("archivesName") String archivesName);
 }

+ 1 - 1
paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/PaperArchivesTypeMapper.java

@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface PaperArchivesTypeMapper extends BaseMapper<PaperArchivesType> {
 
-    PaperArchivesType selectByArchivesType(@Param("archivesTypeName") String archivesTypeName);
+    PaperArchivesType selectByArchivesType(@Param("schoolId") Long schoolId, @Param("archivesTypeName") String archivesTypeName);
 }

+ 2 - 2
paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperArchivesService.java

@@ -14,7 +14,7 @@ public interface PaperArchivesService extends IService<PaperArchives> {
 
     IPage<PaperArchivesResult> pageData(Long semesterId, Long managerOrgId, Long archivesTypeId, String archivesName, Integer pageNumber, Integer pageSize);
 
-    boolean delete(Long id);
-
     boolean saveData(PaperArchives paperArchives);
+
+    boolean delete(Long id);
 }

+ 20 - 7
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesServiceImpl.java

@@ -9,7 +9,10 @@ import com.qmth.paper.library.business.entity.PaperScanTask;
 import com.qmth.paper.library.business.mapper.PaperArchivesMapper;
 import com.qmth.paper.library.business.service.PaperArchivesService;
 import com.qmth.paper.library.business.service.PaperScanTaskService;
+import com.qmth.paper.library.common.contant.SystemConstant;
+import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
+import com.qmth.paper.library.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,6 +34,23 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
         return this.baseMapper.pageData(new Page<>(pageNumber, pageSize), semesterId, managerOrgId, archivesTypeId, archivesName);
     }
 
+    @Override
+    public boolean saveData(PaperArchives paperArchives) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        // todo 生成档案编号
+
+        PaperArchives archives = this.baseMapper.selectByArchivesName(schoolId, paperArchives.getArchivesName());
+        if (archives != null) {
+            throw ExceptionResultEnum.ERROR.exception("档案名称已存在");
+        }
+        paperArchives.setId(SystemConstant.getDbUuid());
+        paperArchives.setSchoolId(schoolId);
+        paperArchives.setCreateId(sysUser.getId());
+        paperArchives.setCreateTime(System.currentTimeMillis());
+        return this.save(paperArchives);
+    }
+
     @Override
     public boolean delete(Long id) {
         PaperArchives paperArchives = this.getById(id);
@@ -45,11 +65,4 @@ public class PaperArchivesServiceImpl extends ServiceImpl<PaperArchivesMapper, P
         return this.removeById(id);
     }
 
-    @Override
-    public boolean saveData(PaperArchives paperArchives) {
-        // todo 生成档案编号
-
-
-        return false;
-    }
 }

+ 1 - 1
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperArchivesTypeServiceImpl.java

@@ -33,7 +33,7 @@ public class PaperArchivesTypeServiceImpl extends ServiceImpl<PaperArchivesTypeM
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
 
-        PaperArchivesType archivesType = this.baseMapper.selectByArchivesType(paperArchivesType.getArchivesTypeName());
+        PaperArchivesType archivesType = this.baseMapper.selectByArchivesType(schoolId, paperArchivesType.getArchivesTypeName());
 
         // 新增
         if (paperArchivesType.getId() == null) {

+ 29 - 0
paper-library-business/src/main/resources/mapper/PaperArchivesMapper.xml

@@ -1,6 +1,28 @@
 <?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.qmth.paper.library.business.mapper.PaperArchivesMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qmth.paper.library.business.entity.PaperArchives">
+        <result column="id" property="id"/>
+        <result column="school_id" property="schoolId"/>
+        <result column="semester_id" property="semesterId"/>
+        <result column="manager_org_id" property="managerOrgId"/>
+        <result column="archives_name" property="archivesName"/>
+        <result column="archives_code" property="archivesCode"/>
+        <result column="archives_type_id" property="archivesTypeId"/>
+        <result column="manager_id" property="managerId"/>
+        <result column="warning_time" property="warningTime"/>
+        <result column="create_id" property="createId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_id" property="updateId"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        select id, school_id, semester_id, manager_org_id,archives_name, archives_code, archives_type_id, manager_id, warning_time, create_id, create_time, update_id, update_time from paper_archives
+    </sql>
+
     <select id="pageData" resultType="com.qmth.paper.library.business.bean.result.PaperArchivesResult">
         SELECT
             pa.id,
@@ -44,4 +66,11 @@
             </if>
         </where>
     </select>
+    <select id="selectByArchivesName" resultMap="BaseResultMap">
+        <include refid="Base_Column_List"></include>
+        <where>
+            and school_id = #{schoolId}
+            and archives_name = #{archivesName}
+        </where>
+    </select>
 </mapper>

+ 1 - 0
paper-library-business/src/main/resources/mapper/PaperArchivesTypeMapper.xml

@@ -20,6 +20,7 @@
     <select id="selectByArchivesType" resultMap="BaseResultMap">
         <include refid="Base_Column_List"></include>
         <where>
+            and school_id = #{schoolId}
             and archives_type = #{archivesTypeName}
         </where>
     </select>