转移申请更改

.idea/artifacts/depository_manage_war_exploded.xml

@@ -1,100 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="depository_manage:war exploded">
-    <output-path>$PROJECT_DIR$/target/depository</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <exploded>true</exploded>
-        <module>depository_manage</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="depository_manage" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" />
-          <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" />
-          <element id="library" level="project" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.26" />
-          <element id="library" level="project" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" />
-          <element id="library" level="project" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" />
-          <element id="library" level="project" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" />
-          <element id="library" level="project" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" />
-          <element id="library" level="project" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: com.sun.mail:jakarta.mail:1.6.5" />
-          <element id="library" level="project" name="Maven: com.sun.activation:jakarta.activation:1.2.2" />
-          <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" />
-          <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus:3.4.2" />
-          <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" />
-          <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" />
-          <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" />
-          <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:4.0" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.5.6" />
-          <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:2.0.5" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: com.zaxxer:HikariCP:3.4.5" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.2.3" />
-          <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.2.3" />
-          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.30" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.22" />
-          <element id="library" level="project" name="Maven: com.alibaba:druid:1.1.14" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.2.12.RELEASE" />
-          <element id="library" level="project" name="Maven: joda-time:joda-time:2.9.7" />
-          <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.9.5" />
-          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.62" />
-          <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot:2.3.7.RELEASE" />
-          <element id="library" level="project" name="Maven: com.alibaba:easyexcel:3.1.0" />
-          <element id="library" level="project" name="Maven: com.alibaba:easyexcel-core:3.1.0" />
-          <element id="library" level="project" name="Maven: com.alibaba:easyexcel-support:3.1.0" />
-          <element id="library" level="project" name="Maven: org.apache.poi:poi:4.1.2" />
-          <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.14" />
-          <element id="library" level="project" name="Maven: org.apache.commons:commons-collections4:4.4" />
-          <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.6.1" />
-          <element id="library" level="project" name="Maven: com.zaxxer:SparseBitSet:1.2" />
-          <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:4.1.2" />
-          <element id="library" level="project" name="Maven: org.apache.commons:commons-compress:1.19" />
-          <element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.06" />
-          <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" />
-          <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" />
-          <element id="library" level="project" name="Maven: org.apache.commons:commons-csv:1.8" />
-          <element id="library" level="project" name="Maven: org.ehcache:ehcache:3.8.1" />
-          <element id="library" level="project" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" />
-          <element id="library" level="project" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" />
-          <element id="library" level="project" name="Maven: org.glassfish.jaxb:txw2:2.3.3" />
-          <element id="library" level="project" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" />
-          <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.5" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/target/depository/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="depository_manage/web/Web" />
-    </root>
-  </artifact>
-</component>

.idea/artifacts/depository_war.xml

@@ -1,14 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="depository:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <module>depository</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
-    <root id="archive" name="depository.war">
-      <element id="artifact" artifact-name="depository:war exploded" />
-    </root>
-  </artifact>
-</component>

.idea/compiler.xml

@@ -9,6 +9,7 @@
         <outputRelativeToContentRoot value="true" />
         <module name="depository" />
         <module name="depository_manage" />
+        <module name="depositroy" />
       </profile>
     </annotationProcessing>
   </component>

.idea/depositroy.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@@ -145,6 +145,7 @@ public class DepositoryRecordController {
         UserByPort departmentHeadByUser = findDepartmentHeadByUser(userToken);
         map.put("departmenthead",departmentHeadByUser.getId());
         map.put("applicantId",userToken.getId());
+
         return CrudUtil.postHandle(depositoryRecordService.transferApply(map),1);
     }
 

src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java

@@ -100,4 +100,9 @@ public class ApplicationOutRecord {
      */
     private Integer istransfer;
 
+    /**
+     * 转移申请编号
+     */
+    private Integer transferId;
+
 }

src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java

@@ -21,6 +21,21 @@ public class TransferRecord implements java.io.Serializable {
     /** 转入仓库id */
     private Integer toId;
 
+    /**
+     * 转移物品编号
+     */
+    private Integer mid;
+
+    /**
+     * 申请时间
+     */
+    private Long applicantTime;
+
+    /**
+     * 申请人
+     */
+    private Integer applicantId;
+
     /* This code was generated by TableGo tools, mark 1 end. */
 
     /* This code was generated by TableGo tools, mark 2 begin. */
@@ -82,5 +97,29 @@ public class TransferRecord implements java.io.Serializable {
         this.toId = toId;
     }
 
+    public Integer getMid() {
+        return mid;
+    }
+
+    public void setMid(Integer mid) {
+        this.mid = mid;
+    }
+
+    public Long getApplicantTime() {
+        return applicantTime;
+    }
+
+    public void setApplicantTime(Long applicantTime) {
+        this.applicantTime = applicantTime;
+    }
+
+    public Integer getApplicantId() {
+        return applicantId;
+    }
+
+    public void setApplicantId(Integer applicantId) {
+        this.applicantId = applicantId;
+    }
+
     /* This code was generated by TableGo tools, mark 2 end. */
 }

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -80,6 +80,7 @@
         <result column="depositoryManagerMessage" property="depositoryManagerMessage" jdbcType="VARCHAR" />
         <result column="aorstate" property="state" jdbcType="VARCHAR" />
         <result column="istransfer" property="istransfer" jdbcType="INTEGER" />
+        <result column="transferId" property="transferId" jdbcType="INTEGER" />
 
     </resultMap>
 
@@ -114,7 +115,7 @@
 
     <sql id="ApplicationOutRecordInfo">
         aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
-        depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer
+        depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,transferId
     </sql>
     <!-- 查询所有数据行数 -->
     <select id="findCount" resultType="integer">
@@ -249,11 +250,11 @@
         FROM applicationOutRecordInfo WHERE 1=1
         <if test='isDone == "0"'>
             and (departmentHeadTime = 0 and departmenthead=#{userId}  and DepartmentheadPass = 3)
-            or (depositoryManagerTime = 0 and FIND_IN_SET(#{userId},depositoryManager) != 0  and DepartmentheadPass = 3)
+            or (depositoryManagerTime = 0 and FIND_IN_SET(#{userId},depositoryManager) != 0  and depositoryManagerPass = 3)
         </if>
         <if test='isDone == "1"'>
             and (departmentHeadTime != 0 and departmenthead=#{userId} and DepartmentheadPass != 3)
-            or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0 and DepartmentheadPass != 3)
+            or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0 and depositoryManagerPass != 3)
         </if>
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
@@ -549,7 +550,7 @@
     <insert id="insertApplicationOutRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
         insert into application_out_record
         (id,mid,depository_id,applicant_id,applicant_time,code,price,quantity,departmenthead,departmenthead_pass,departmenthead_time,
-        departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer)
+        departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer,transferId)
         values(
         #{id},
         #{mid},
@@ -560,7 +561,12 @@
         #{price},
         #{quantity},
         #{departmenthead},
-        #{departmentheadPass},
+        <if test="departmentheadPass == null ">
+            3,
+        </if>
+        <if test="departmentheadPass != null and departmentheadPass != ''">
+            #{departmentheadPass},
+        </if>
         <if test="departmentheadTime == null">
             0,
         </if>
@@ -569,7 +575,13 @@
         </if>
         #{departmentheadMessgae},
         #{depositoryManager},
-        #{depositoryManagerPass},
+        <if test="depositoryManagerPass == null">
+            3,
+        </if>
+        <if test="depositoryManagerPass != null and depositoryManagerPass != ''">
+            #{depositoryManagerPass},
+        </if>
+
         <if test="depositoryManagerTime == null">
             0,
         </if>
@@ -579,7 +591,8 @@
         #{depositoryManagerMessage},
         #{applyRemark},
         #{state},
-        #{istransfer}
+        #{istransfer},
+        #{transferId}
         )
     </insert>
 

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -99,6 +99,9 @@
         <include refid="allColumnsAndTypeNameOnView" />
         from findMaterial
         where 1 = 1
+        <if test="mid != null">
+            and id = #{mid}
+        </if>
         <if test="depositoryId != null">
             AND depository_id = #{depositoryId}
         </if>

src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.java

@@ -1,8 +1,10 @@
 package com.dreamchaser.depository_manage.mapper;
 
+import com.dreamchaser.depository_manage.entity.TransferRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,4 +19,18 @@ public interface TransferRecordMapper {
      * @return 受影响的行数
      */
     Integer addTransferRecord(Map<String,Object> map);
+
+    /**
+     * 根据条件查询转移记录
+     * @param map
+     * @return
+     */
+    List<TransferRecord> findTransferRecordByCondition(Map<String,Object> map);
+
+    /**
+     * 根据主键查询转移记录
+     * @param id
+     * @return
+     */
+    TransferRecord findTransferRecordById(Integer id);
 }

src/main/java/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml

@@ -9,10 +9,13 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="from_id" property="fromId" jdbcType="INTEGER" />
         <result column="to_id" property="toId" jdbcType="INTEGER" />
+        <result column="mid" property="mid" jdbcType="INTEGER" />
+        <result column="applicantTime" property="applicantTime" jdbcType="INTEGER" />
+        <result column="applicantId" property="applicantId" jdbcType="INTEGER" />
     </resultMap>
     <!-- 表查询字段 -->
     <sql id="allColumns">
-        tr.id, tr.from_id, tr.to_id
+        tr.id, tr.from_id, tr.to_id,tr.mid,tr.applicantTime,tr.applicantId
     </sql>
 
     <!-- 查询所有
@@ -23,7 +26,7 @@
     </select>-->
 
 
-    <!-- 根据条件参数查询列表
+<!--     根据条件参数查询列表-->
         <select id="findTransferRecordByCondition" resultMap="transferRecordMap" parameterType="map">
         SELECT
             <include refid="allColumns" />
@@ -34,7 +37,16 @@
         <if test="toId != null">
             AND tr.to_id = #{toId}
         </if>
-    </select>-->
+        <if test="mid != null">
+            and tr.mid = #{mid}
+        </if>
+        <if test="applicantTime != null">
+            and tr.applicantTime = #{applicantTime}
+        </if>
+        <if test="applicantId != null">
+            and tr.applicantId = #{applicantId}
+        </if>
+    </select>
 
 
     <!-- 根据主键查询信息
@@ -47,16 +59,23 @@
         </foreach>
     </select>-->
 
-
+    <select id="findTransferRecordById" resultMap="transferRecordMap" parameterType="int">
+        SELECT
+        <include refid="allColumns" />
+        FROM transfer_record tr WHERE tr.id = #{id}
+    </select>
     <!-- 新增信息 -->
     <insert id="addTransferRecord">
         INSERT INTO transfer_record (
-            id, from_id, to_id,quantity
+            id, from_id, to_id,quantity,mid,applicantTime,applicantId
         ) VALUES (
             #{id},
             #{fromId},
             #{toId},
-            #{quantity}
+            #{quantity},
+            #{mid},
+            #{applicantTime},
+            #{applicantId}
         )
     </insert>
 

src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@@ -123,4 +123,9 @@ public class ApplicationOutRecordP {
      * 是否为转移申请
      */
     private Integer istransfer;
+
+    /**
+     * 转移申请编号
+     */
+    private Integer transferId;
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -130,13 +130,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         map.put("applicantTime", DateUtil.DateTimeToTimeStamp(simpleTime));
         map.put("price", material.getPrice() * quantity * 100);
         map.put("istransfer",1);
-        depositoryRecordMapper.insertApplicationOutRecord(map);
         map.put("fromId", material.getDepositoryId());
         //清除主键
 //        depositoryRecordMapper.insertApplicationInRecord(map);
-        map.put("toId", map.get("id"));
+        transferRecordMapper.addTransferRecord(map);
+        TransferRecord transferRecordByCondition = transferRecordMapper.findTransferRecordByCondition(map).get(0);
+        map.put("transferId",transferRecordByCondition.getId());
         //清除主键
-        return transferRecordMapper.addTransferRecord(map);
+        return depositoryRecordMapper.insertApplicationOutRecord(map);
     }
 
     /**
@@ -183,7 +184,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                         material.setQuantity(material.getQuantity() - record.getQuantity());
                         materialMapper.updateMaterial(material);
                         if(record.getIstransfer() == 1){
-                            applicationIn(map);
+                            map.put("quantity",record.getQuantity().toString());
+                            map.put("applicantId",record.getApplicantId());
+                            map.put("transferId",record.getTransferId());
+                            transferMaterial(map);
                         }
                     } else {
                         throw new MyException("库存不足于该出库请求");
@@ -193,9 +197,43 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 map.put("state", "仓库管理员审核未通过");
             }
         }
-//        return depositoryRecordMapper.updateDepositoryRecord(map);
         return depositoryRecordMapper.updateApplicationOutRecord(map);
     }
+
+    /**
+     * 转移物品
+     * @param map
+     */
+    public void transferMaterial(Map<String,Object> map){
+        Map<String,Object> param = new HashMap<>();
+        Integer transferId = ObjectFormatUtil.toInteger(map.get("transferId"));
+        TransferRecord transferRecor = transferRecordMapper.findTransferRecordById(transferId);
+        Integer mid =  transferRecor.getMid();
+        Material material = materialMapper.findMaterialById(mid);
+        param.put("mname",material.getMname());
+        param.put("depositoryId",transferRecor.getToId());
+        List<Material> materiallist = materialMapper.findMaterialByCondition(param);
+        map.put("mid",materiallist.get(0).getId());
+        if(materiallist.size() > 0){
+            applicationIn(map);
+        }else{
+            Map<String,Object> insert = new HashMap<>();
+            Material materialById = materialMapper.findMaterialById(mid);
+            Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity"));
+            insert.put("depositoryId",transferRecor.getToId());
+            insert.put("price",materialById.getPrice());
+            insert.put("mname",materialById.getMname());
+            insert.put("quantity",quantity);
+            insert.put("materialTypeId",materialById.getTypeId());
+            insert.put("code",materialById.getCode());
+            insert.put("unit",materialById.getUnit());
+            insert.put("version",materialById.getVersion());
+            insert.put("texture",materialById.getTexture());
+            insert.put("amounts",quantity * materialById.getPrice());
+            insert.put("depositoryCode",materialById.getDepositoryCode());
+            materialMapper.insertMaterial(insert);
+        }
+    }
    /* @Override
     @Transactional
     public Integer review(Map<String, Object> map, Integer userid) {

target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -80,6 +80,7 @@
         <result column="depositoryManagerMessage" property="depositoryManagerMessage" jdbcType="VARCHAR" />
         <result column="aorstate" property="state" jdbcType="VARCHAR" />
         <result column="istransfer" property="istransfer" jdbcType="INTEGER" />
+        <result column="transferId" property="transferId" jdbcType="INTEGER" />
 
     </resultMap>
 
@@ -114,7 +115,7 @@
 
     <sql id="ApplicationOutRecordInfo">
         aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
-        depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer
+        depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,transferId
     </sql>
     <!-- 查询所有数据行数 -->
     <select id="findCount" resultType="integer">
@@ -249,11 +250,11 @@
         FROM applicationOutRecordInfo WHERE 1=1
         <if test='isDone == "0"'>
             and (departmentHeadTime = 0 and departmenthead=#{userId}  and DepartmentheadPass = 3)
-            or (depositoryManagerTime = 0 and FIND_IN_SET(#{userId},depositoryManager) != 0  and DepartmentheadPass = 3)
+            or (depositoryManagerTime = 0 and FIND_IN_SET(#{userId},depositoryManager) != 0  and depositoryManagerPass = 3)
         </if>
         <if test='isDone == "1"'>
             and (departmentHeadTime != 0 and departmenthead=#{userId} and DepartmentheadPass != 3)
-            or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0 and DepartmentheadPass != 3)
+            or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0 and depositoryManagerPass != 3)
         </if>
         <if test="begin != null and size != null">
             LIMIT #{begin},#{size}
@@ -549,7 +550,7 @@
     <insert id="insertApplicationOutRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
         insert into application_out_record
         (id,mid,depository_id,applicant_id,applicant_time,code,price,quantity,departmenthead,departmenthead_pass,departmenthead_time,
-        departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer)
+        departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,depository_manager_message,apply_remark,state,istransfer,transferId)
         values(
         #{id},
         #{mid},
@@ -560,7 +561,12 @@
         #{price},
         #{quantity},
         #{departmenthead},
-        #{departmentheadPass},
+        <if test="departmentheadPass == null ">
+            3,
+        </if>
+        <if test="departmentheadPass != null and departmentheadPass != ''">
+            #{departmentheadPass},
+        </if>
         <if test="departmentheadTime == null">
             0,
         </if>
@@ -569,7 +575,13 @@
         </if>
         #{departmentheadMessgae},
         #{depositoryManager},
-        #{depositoryManagerPass},
+        <if test="depositoryManagerPass == null">
+            3,
+        </if>
+        <if test="depositoryManagerPass != null and depositoryManagerPass != ''">
+            #{depositoryManagerPass},
+        </if>
+
         <if test="depositoryManagerTime == null">
             0,
         </if>
@@ -579,7 +591,8 @@
         #{depositoryManagerMessage},
         #{applyRemark},
         #{state},
-        #{istransfer}
+        #{istransfer},
+        #{transferId}
         )
     </insert>
 

target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -99,6 +99,9 @@
         <include refid="allColumnsAndTypeNameOnView" />
         from findMaterial
         where 1 = 1
+        <if test="mid != null">
+            and id = #{mid}
+        </if>
         <if test="depositoryId != null">
             AND depository_id = #{depositoryId}
         </if>

target/classes/com/dreamchaser/depository_manage/mapper/TransferRecordMapper.xml

@@ -9,10 +9,13 @@
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="from_id" property="fromId" jdbcType="INTEGER" />
         <result column="to_id" property="toId" jdbcType="INTEGER" />
+        <result column="mid" property="mid" jdbcType="INTEGER" />
+        <result column="applicantTime" property="applicantTime" jdbcType="INTEGER" />
+        <result column="applicantId" property="applicantId" jdbcType="INTEGER" />
     </resultMap>
     <!-- 表查询字段 -->
     <sql id="allColumns">
-        tr.id, tr.from_id, tr.to_id
+        tr.id, tr.from_id, tr.to_id,tr.mid,tr.applicantTime,tr.applicantId
     </sql>
 
     <!-- 查询所有
@@ -23,7 +26,7 @@
     </select>-->
 
 
-    <!-- 根据条件参数查询列表
+<!--     根据条件参数查询列表-->
         <select id="findTransferRecordByCondition" resultMap="transferRecordMap" parameterType="map">
         SELECT
             <include refid="allColumns" />
@@ -34,7 +37,16 @@
         <if test="toId != null">
             AND tr.to_id = #{toId}
         </if>
-    </select>-->
+        <if test="mid != null">
+            and tr.mid = #{mid}
+        </if>
+        <if test="applicantTime != null">
+            and tr.applicantTime = #{applicantTime}
+        </if>
+        <if test="applicantId != null">
+            and tr.applicantId = #{applicantId}
+        </if>
+    </select>
 
 
     <!-- 根据主键查询信息
@@ -47,16 +59,23 @@
         </foreach>
     </select>-->
 
-
+    <select id="findTransferRecordById" resultMap="transferRecordMap" parameterType="int">
+        SELECT
+        <include refid="allColumns" />
+        FROM transfer_record tr WHERE tr.id = #{id}
+    </select>
     <!-- 新增信息 -->
     <insert id="addTransferRecord">
         INSERT INTO transfer_record (
-            id, from_id, to_id,quantity
+            id, from_id, to_id,quantity,mid,applicantTime,applicantId
         ) VALUES (
             #{id},
             #{fromId},
             #{toId},
-            #{quantity}
+            #{quantity},
+            #{mid},
+            #{applicantTime},
+            #{applicantId}
         )
     </insert>