Browse Source

业务品类管理编号及分级规则修改

anderx 8 years ago
parent
commit
2fc6492572

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -16,7 +16,7 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.utils.StringUtils;
 @RestController
-@RequestMapping("open/api/admin/Varieties")
+@RequestMapping("/api/admin/Varieties")
 public class AdminVarietiesApiController extends CertifyApiController{
 	@Resource
 	private AdminVarietiesService adminVarietiesService;

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

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
-import com.goafanti.app.bo.AppAdminListBo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.mybatis.page.Pagination;
 

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

@@ -9,7 +9,6 @@ import com.goafanti.admin.bo.BusinessProjectBo;
 import com.goafanti.admin.bo.ProjectSizeBo;
 import com.goafanti.app.bo.ProjectBo;
 import com.goafanti.common.model.BusinessProject;
-import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.common.model.ProjectSize;
 import com.goafanti.core.mybatis.page.Pagination;
 

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

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.service.AdminService;
-import com.goafanti.app.bo.AppAdminListBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;

+ 15 - 16
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -48,7 +48,7 @@ public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesM
 				}
 				buv.setCid(s);
 		}
-		System.out.println("========================cid:"+buv.getCid());
+		
 		//判断是否数据库这个ID已经存在
 		String n=businessVarietiesMapper.ThanCid(buv.getCid());
 		while(StringUtils.isNotBlank(n)) {
@@ -129,23 +129,21 @@ public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesM
 		BusinessVarieties bs=new BusinessVarieties();
 		bs=businessVarietiesMapper.selectByPrimaryKey(id);
 		bs.setCname(cname);
-		String str=businessVarietiesMapper.getCid(superId);
-		int i=Integer.valueOf(businessVarietiesMapper.getCount(superId));
-			if (3>str.length()) {
-				if(Integer.valueOf(i)<=9){
-					
-					bs.setCid("BZ0"+i);
-				}else {
-					bs.setCid("BZ"+i);
-				}
-			}else {
-				int w=i+1;
-				if(Integer.valueOf(i)<9){
-					bs.setCid(str+"0"+w);
+		String str=businessVarietiesMapper.getCidMax(superId);
+		String scid=businessVarietiesMapper.getCid(superId);
+		if (null==str) {
+			bs.setCid(scid+"01");	
+		}else {
+			int i=Integer.valueOf(str.substring(str.length()-2, str.length()));
+			 i=(i%99)+1;
+				String s;
+				if (i<10) {
+					s=str.substring(0,str.length()-2)+"0"+i;
 				}else {
-					bs.setCid(str+w);
+					s=str.substring(0,str.length()-2)+i;
 				}
-			}
+				bs.setCid(s);
+		}
 			//判断是否数据库这个ID已经存在
 			checkCid(bs);
 		//将子品类名称编号做修改
@@ -157,6 +155,7 @@ public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesM
 			BusinessVarieties bvs=businessVarietiesMapper.selectByPrimaryKey(n);
 			String s2=bvs.getCid().substring(w.length()-2, w.length());
 			bvs.setCid(c1+s2);
+			bvs.setLayer(bvs.getCid().length()/2-1);
 			checkCid(bvs);
 			businessVarietiesMapper.updateByPrimaryKey(bvs);
 		}

+ 0 - 4
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -5,19 +5,15 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
-
 import com.goafanti.achievement.bo.AchievementListBo;
-import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.enums.AchievementBargainingMode;
 import com.goafanti.common.enums.AchievementMaturity;

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.goafanti.common.dao.BusinessVarietiesMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.BusinessVarieties">
     <!--
@@ -496,7 +496,7 @@
 	and b.layer=1
   	</select>
   	
-  	<select id="getCidMax" resultType="Integer">
+  	<select id="getCidMax" resultType="String">
   		select max(cid)
   from business_varieties
  where super_id=#{superId,jdbcType=VARCHAR}