Browse Source

Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java


Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
1fd86a5ff8

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrderExamineMapper.java

@@ -105,4 +105,6 @@ public interface OrderExamineMapper {
 	int selectByOrderNoAndAid(@Param("orderNo") String orderNo,@Param("aid") String aid);
 
 	void updateByOrderNo(@Param("orderNo") String orderNo,@Param("status")Integer status);
+
+	void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId);
 }

+ 4 - 0
src/main/java/com/goafanti/common/mapper/OrderExamineMapper.xml

@@ -329,4 +329,8 @@
     and status=#{status}
     </if>
   </update>
+   <update id="updateDimissionTransfer">
+  update order_examine set aid= #{transferId}
+	where status=0 and aid= #{aid}
+  </update>
 </mapper>

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

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.ContractTaskLogMapper;
 import com.goafanti.common.dao.OrderExamineMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.PatentNewMapper;
@@ -58,8 +57,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	@Autowired
 	private RoleResourcesMapper		roleResourcesMapper;
 	@Autowired
-	private ContractTaskLogMapper	contractTaskLogMapper;
-	@Autowired
 	private UserBusinessMapper		userBusinessMapper;
 	@Autowired
 	private PatentNewMapper			patentNewMapper;
@@ -225,6 +222,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				if (type!=-1) {
 					tOrderTaskMapper.updateDimissionTransfer(aid,transferId,type);
 					tTaskLogMapper.updateDimissionTransfer(aid,transferId);
+					orderExamineMapper.updateDimissionTransfer(aid,transferId);
 				}
 			}
 			if (s!=roleResources.QDYW.getCode()) {