瀏覽代碼

修改离职一键转交

anderx 4 年之前
父節點
當前提交
6ffc1bf8b2

+ 32 - 0
pom.xml

@@ -69,6 +69,38 @@
 			<artifactId>spring-web</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
+		
+        <dependency>  
+            <groupId>javax.annotation</groupId>  
+            <artifactId>jsr250-api</artifactId>  
+            <version>1.0</version>  
+        </dependency> 
+        <!-- hibernate-validator -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.4.0.Final</version>
+        </dependency>
+        <dependency>
+     <groupId>javax.xml.bind</groupId>
+     <artifactId>jaxb-api</artifactId>
+     <version>2.3.0</version>
+ </dependency>
+ <dependency>
+     <groupId>com.sun.xml.bind</groupId>
+     <artifactId>jaxb-impl</artifactId>
+     <version>2.3.0</version>
+ </dependency>
+ <dependency>
+     <groupId>com.sun.xml.bind</groupId>
+     <artifactId>jaxb-core</artifactId>
+     <version>2.3.0</version>
+ </dependency>
+ <dependency>
+     <groupId>javax.activation</groupId>
+     <artifactId>activation</artifactId>
+     <version>1.1.1</version>
+ </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>

+ 4 - 4
src/main/java/com/goafanti/achievement/bo/AchievementDemandListBo.java

@@ -1,12 +1,12 @@
 package com.goafanti.achievement.bo;
 
-import java.util.Date;
-
-import org.apache.commons.lang3.time.DateFormatUtils;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.util.Date;
+
 /**
  * 成果需求匹配列表对象
  */

+ 1 - 0
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -4,6 +4,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+ 4 - 3
src/main/java/com/goafanti/common/mapper/UserTransferLogMapper.xml

@@ -203,9 +203,10 @@
 select id,aid, #{transferId},13,#{date} from user where share_type =0 and aid = #{aid}
   </insert>
   <insert id="insertUserLockLog">
-   	INSERT INTO user_transfer_log (uid, aid, take_aid,pid, `type`, create_time)
-select id,aid,#{transferId},business_project_id ,14,#{date} 
-from user_lock_release where `type` =1 and aid =#{aid}
+	INSERT INTO user_transfer_log (uid, aid, take_aid,pid, `type`,create_time)
+	select a.id,a.aid,#{transferId},b.business_project_id ,14,#{date} from `user` a 
+	left join user_lock_release b on a.id=b.uid
+	where a.share_type =2 and a.aid= #{aid} and b.`type` =1
   </insert>
   
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/permission/controller/NewRoleApiController.java

@@ -166,7 +166,7 @@ public class NewRoleApiController extends BaseApiController{
 		return res;
 	}
 	/**
-	 * 离职人员转交
+	 * 离职转交
 	 * @param aid 离职ID
 	 * @param transferId 转交ID
 	 * @return

+ 1 - 0
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -223,6 +223,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				userMapper.updateDimissionTransfer(aid,transferId);
 			}
 			if (s==roleResources.QDYW.getCode()) {
+				System.out.println("\n\n业务转交");
 				userTransferLogMapper.insertUserLockLog(aid,transferId,date);
 				patentNewMapper.updateAdmin(aid,transferId);
 				roleResourcesMapper.updateLockRelease("1",aid,transferId);//将业务锁转给指定人