Просмотр исходного кода

1、经理查看六要素
2、管理员新增公出审核人员
3、公出打卡列表修改审核列表
4、修改项目统计列表

anderx лет назад: 4
Родитель
Сommit
9c11eb850d

+ 4 - 5
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -85,17 +85,16 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 				return res;
 			}
-
 			Admin a = newAdminService.selectByMobile(admin.getMobile().trim());
 			if (null != a) {
 				res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 				return res;
 			}
 			if (newAdminService.checkAdminRole(roles,null)) {
-				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "咨询师管理员"));				
-				return res;	
+				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "咨询师管理员"));
+				return res;
 			}
-			
+
 
 			Admin ad = new Admin();
 			BeanUtils.copyProperties(admin, ad);
@@ -108,7 +107,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				ad.setPassword(AFTConstants.INITIALPASSWORD);
 			}
 			ad.setPassword(passwordUtil.getEncryptPwd(ad));
-			
+
 			res.setData(newAdminService.insertNewAdmin(ad,roles));
 		}
 

+ 2 - 27
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -213,32 +213,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 		ad.setStatus("正常");
 		ad.setId(UUID.randomUUID().toString());
 		ad.setType(sumType(roleIds));
-		/*String sdepNo=adminMapper.selectUserNoBySuperiorId(ad.getSuperiorId());
-		int Count=adminMapper.selectCountBySuperiorId(ad.getSuperiorId());
-		if(Count<10){
-			String dep=sdepNo+"0"+Count;
-			String sid=adminMapper.selectIdByUserNo(dep);
-			while(sid!=null){
-				Count=Count+1;				
-				if(Count>=10){
-					dep=sdepNo+Count;	
-				}else{
-					dep=sdepNo+"0"+Count;
-				}
-				sid=adminMapper.selectIdByUserNo(dep);				
-			}
-			ad.setUserNo(dep);
-		}
-		if(Count>=10){
-			String dep=sdepNo+Count;
-			String sid=adminMapper.selectIdByUserNo(dep);
-			while(sid!=null){
-				Count=Count+1;				
-				dep=sdepNo+Count;
-				sid=adminMapper.selectIdByUserNo(dep);				
-			}
-			ad.setUserNo(dep);
-		}	*/	
+
 		Map<String, Object> params = new HashMap<>();
 		params.put("uid", ad.getId());
 		params.put("roles", roleIds);
@@ -250,7 +225,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 			}
 			TokenManager.clearUserAuthByUserId(ad.getId());
 		}
-		return adminMapper.insertn(ad);
+		return adminMapper.insert(ad);
 	}
 
 	@Override

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1526,7 +1526,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
     </if>
     <if test="contractNo != null">
-      and a.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
+      and b.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
     </if>
   	<if test="depId != null">
   	and b.order_dep= #{depId,jdbcType=VARCHAR}
@@ -1571,7 +1571,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%') 
   	</if>
      <if test="contractNo != null">
-       and a.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
+       and b.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
      </if>
   	<if test="depId != null">
   	and b.order_dep= #{depId,jdbcType=VARCHAR}