Ver código fonte

Merge branch 'test' of jishutao/kede-server into prod

anderx 5 anos atrás
pai
commit
7c55260fa2

+ 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>

+ 16 - 15
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -16,7 +16,7 @@ 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;
 import com.goafanti.common.dao.RoleMapper;
@@ -45,33 +45,33 @@ import com.goafanti.permission.service.NewRoleService;
 @Service
 public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements NewRoleService {
 	@Autowired
-	RoleMapper				roleMapper;
+	private RoleMapper				roleMapper;
 	@Autowired
-	UserMapper				userMapper;
+	private UserMapper				userMapper;
 	@Autowired
-	AdminMapper				adminMapper;
+	private AdminMapper				adminMapper;
 	@Autowired
-	UserRoleMapper			userRoleMapper;
+	private UserRoleMapper			userRoleMapper;
 	@Autowired
-	RolePermissionMapper	rolePermissionMapper;
+	private RolePermissionMapper	rolePermissionMapper;
 	@Autowired
-	RoleResourcesMapper		roleResourcesMapper;
+	private RoleResourcesMapper		roleResourcesMapper;
 	@Autowired
-	ContractTaskLogMapper	contractTaskLogMapper;
+	private UserBusinessMapper		userBusinessMapper;
 	@Autowired
-	UserBusinessMapper		userBusinessMapper;
+	private PatentNewMapper			patentNewMapper;
 	@Autowired
-	PatentNewMapper			patentNewMapper;
+	private OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
-	OrganizationContactBookMapper	organizationContactBookMapper;
+	private TOrderTaskMapper	tOrderTaskMapper;
 	@Autowired
-	TOrderTaskMapper	tOrderTaskMapper;
+	private TOrderNewMapper	tOrderNewMapper;
 	@Autowired
-	TOrderNewMapper	tOrderNewMapper;
+	private TTaskLogMapper	tTaskLogMapper;
 	@Autowired
-	TTaskLogMapper	tTaskLogMapper;
+	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
-	TOrderMidMapper	tOrderMidMapper;
+	private OrderExamineMapper	orderExamineMapper;
 	@Override
 	public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -222,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()) {

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.47
+static.host=//static.jishutao.com/1.1.48
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload