Browse Source

确认签单BUG修复

anderx 7 years ago
parent
commit
8efe42e458

+ 1 - 1
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -63,5 +63,5 @@ public interface AdminService {
 
 	List<Admin> listAdminByName(String name);
 
-	
+	List<AdminListBo> selectDepartmentStaff(String departmentId,String name);
 }

+ 6 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -224,6 +224,12 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return adminMapper.listAdminByName(name);
 	}
 
+	@Override
+	public List<AdminListBo> selectDepartmentStaff(String departmentId, String name) {
+		
+		return adminMapper.selectDepartmentStaff( departmentId,  name);
+	}
+
 	
 
 }

+ 7 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -106,5 +106,12 @@ public interface AdminMapper {
 	 * @return
 	 */
 	Admin selectAdminByRoleId(@Param("roleId")String roleId);
+	/**
+	 * 查询部门下的员工
+	 * @param departmentId
+	 * @param name
+	 * @return
+	 */
+	List<AdminListBo> selectDepartmentStaff(String departmentId, String name);
 
 }

+ 14 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -602,5 +602,19 @@
   
   <select id="selectAdminByRoleId" parameterType="java.lang.String" resultMap="BaseResultMap">
 	select a.id,a.name from  admin a left join user_role b on a.id = b.uid left join role c on b.rid = c.id where c.id = #{roleId,jdbcType=VARCHAR} limit 1
+  </select>
+  
+  <select id="selectDepartmentStaff" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
+	select a.id ,a.name,a.department_id,b.name 
+		from admin a left join department_management b
+		on a.department_id= b.id
+		where 1=1
+		<if test = "departmentId != null and departmentId !='' "> 
+   		and a.department_id = #{departmentId,jdbcType=VARCHAR}
+    </if>
+		<if test = "name != null"> 
+   		and a.name like  concat('%',#{name,jdbcType=VARCHAR},'%')
+    </if>
+		
   </select>
 </mapper>

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -945,7 +945,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	@Transactional
 	public int updateSignServiceOrder(String orderNo,String contractNo, String signFirstPayment, String signTotalAmount,
 			String approval,String orderRemarks,String signTime) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);

+ 14 - 1
src/main/java/com/goafanti/patent/controller/UserPatentApiController.java

@@ -65,6 +65,7 @@ public class UserPatentApiController extends CertifyApiController {
 	private AftFileService					aftFileService;
 	@Resource
 	private OrganizationIdentityService		organizationIdentityService;
+	
 
 	@Value(value = "${upload.private.path}")
 	private String							uploadPrivatePath	= null;
@@ -331,5 +332,17 @@ public class UserPatentApiController extends CertifyApiController {
 		return patentInfoService.getClientApplyList(TokenManager.getUserId(), patentNumber, patentName, patentCatagory,
 				patentState, pNo, pSize);
 	}
-
+	
+	/**
+	 * 查询部门下的员工
+	 */
+	@RequestMapping(value = "/selectDepartmentStaff", method = RequestMethod.GET)
+	public Result selectDepartmentStaff(String departmentId,String name){
+		Result res = new Result();
+		if (StringUtils.isBlank(departmentId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "部门"));
+			return res;
+		}
+		return res.data(adminService.selectDepartmentStaff(departmentId,name));
+	}
 }