Browse Source

管理员新增及修改添加"上级管理员"

Antiloveg 8 years ago
parent
commit
ea4446ff66

+ 3 - 0
schema/2017-06-06.sql

@@ -0,0 +1,3 @@
+alter table `admin` 
+add column `superior_id` varchar(36) null comment '上级管理用户ID',
+add column `city` varchar(16) null comment '所在市';

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementOrderService.java

@@ -19,7 +19,7 @@ public interface AchievementOrderService {
 
 	AchievementOrder selectByPrimaryKey(String id);
 
-	int updateShutdownByUser(AchievementOrder order, Boolean unSign);
+	int updateShutdownByUser(AchievementOrder order);
 
 	List<AchievementOrder> selectAchievementOrderByAchievementId(String string);
 

+ 11 - 6
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -80,12 +80,17 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 	}
 
 	@Override
-	public int updateShutdownByUser(AchievementOrder order, Boolean unSign) {
-		if (unSign) {
-			order.setStatus(AchievementOrderStatus.SHUTDOWNUNSIGN.getCode());
-		} else {
-			order.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
-		}
+	public int updateShutdownByUser(AchievementOrder order) {
+		order.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
+		
+		AchievementOrderLog aol = new AchievementOrderLog();
+		aol.setId(UUID.randomUUID().toString());
+		aol.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
+		aol.setAchievementOrderId(order.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		aol.setRecordTime(now.getTime());
+		achievementOrderLogMapper.insert(aol);
 		return achievementOrderMapper.updateByPrimaryKeySelective(order);
 	}
 

+ 23 - 3
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -25,7 +25,13 @@ public class InputAdmin {
 	
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	position;
-
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String superiorId;
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String city;
+	
 	public String getId() {
 		return id;
 	}
@@ -81,7 +87,21 @@ public class InputAdmin {
 	public void setPosition(String position) {
 		this.position = position;
 	}
-	
-	
 
+	public String getSuperiorId() {
+		return superiorId;
+	}
+
+	public void setSuperiorId(String superiorId) {
+		this.superiorId = superiorId;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+	
 }

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

@@ -263,9 +263,6 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 高企培育资料完成情况(比重)
-	 * 
-	 * @param uid
-	 * @return
 	 */
 	@RequestMapping(value = "/proportion", method = RequestMethod.GET)
 	public Result proportion(String uid) {
@@ -294,8 +291,6 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 管理员"我的客户"列表
-	 * 
-	 * @return
 	 */
 	@RequestMapping(value = "/customer", method = RequestMethod.GET)
 	public Result getCustomer() {
@@ -323,10 +318,6 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 管理员修改本人信息
-	 * 
-	 * @param admin
-	 * @param bindingResult
-	 * @return
 	 */
 	@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
 	public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult) {
@@ -389,14 +380,6 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 管理员列表
-	 * 
-	 * @param province
-	 * @param number
-	 * @param mobile
-	 * @param name
-	 * @param pageNo
-	 * @param pageSize
-	 * @return
 	 */
 	@RequestMapping(value = "/adminList", method = RequestMethod.GET)
 	public Result adminList(String province, Integer number, String mobile, String name, String pageNo,
@@ -416,10 +399,6 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 新增管理员
-	 * 
-	 * @param admin
-	 * @param bindingResult
-	 * @return
 	 */
 	@RequestMapping(value = "/insertAdmin", method = RequestMethod.POST)
 	public Result insertAdmin(@Valid InputAdmin admin, BindingResult bindingResult) {
@@ -454,7 +433,7 @@ public class AdminApiController extends CertifyApiController {
 		ad.setId(UUID.randomUUID().toString());
 		ad.setCreateTime(now.getTime());
 		if (StringUtils.isBlank(ad.getPassword())) {
-			ad.setPassword("123456");
+			ad.setPassword(AFTConstants.INITIALPASSWORD);
 		}
 		ad.setPassword(passwordUtil.getEncryptPwd(ad));
 		adminService.insert(ad);
@@ -484,10 +463,6 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 修改管理员信息
-	 * 
-	 * @param admin
-	 * @param bindingResult
-	 * @return
 	 */
 	@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
 	public Result updateAdmin(@RequestParam(value = "roles[]", required = false) String[] roleIds,

+ 26 - 2
src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java

@@ -68,6 +68,17 @@ public class AdminOrderApiController extends CertifyApiController {
 			return res;
 		}
 		
+		AchievementOrder ao = achievementOrderService.selectByPrimaryKey(order.getId());
+		if (null == ao){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果线索单/意向单ID"));
+			return res;
+		}
+		
+		if (AchievementOrderStatus.SHUTDOWN.getCode().equals(ao.getStatus())){
+			res.getError().add(buildError("", "当前科技成果线索单/意向单已关闭,无法修改!"));
+			return res;
+		}
+		
 		AchievementOrder achievementOrder = new AchievementOrder();
 		AchievementOrderLog aol = new AchievementOrderLog();
 		BeanUtils.copyProperties(order, achievementOrder);
@@ -78,7 +89,7 @@ public class AdminOrderApiController extends CertifyApiController {
 
 	/**
 	 * 关闭科技成果线索单/意向单
-	 */
+	
 	@RequestMapping(value = "/achievementShutdown", method = RequestMethod.POST)
 	public Result achevementShutdown(String id) {
 		Result res = new Result();
@@ -103,6 +114,7 @@ public class AdminOrderApiController extends CertifyApiController {
 
 		return res;
 	}
+	 */
 
 	/**
 	 * 科技成果线索单/意向单Log
@@ -232,6 +244,17 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技需求状态", "科技需求状态"));
 			return res;
 		}
+		
+		DemandOrder demandOrder = demandOrderService.selectByPrimaryKey(inputDemandOrder.getId());
+		if (null == demandOrder){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技需求线索单/意向单ID"));
+			return res;
+		}
+		
+		if (DemandOrderStatus.SHUTDOWN.getCode().equals(demandOrder.getStatus())){
+			res.getError().add(buildError("", "当前科技需求线索单/意向单已关闭,无法修改!"));
+			return res;
+		}
 
 		DemandOrder order = new DemandOrder();
 		DemandOrderLog dol = new DemandOrderLog();
@@ -243,7 +266,7 @@ public class AdminOrderApiController extends CertifyApiController {
 
 	/**
 	 * 关闭科技需求线索单/意向单
-	 */
+	
 	@RequestMapping(value = "/demandShutdown", method = RequestMethod.POST)
 	public Result shutdown(String id) {
 		Result res = new Result();
@@ -265,6 +288,7 @@ public class AdminOrderApiController extends CertifyApiController {
 		res.setData(demandOrderService.updateShutdownByUser(order, unSign));
 		return res;
 	}
+	 */
 
 	/**
 	 * 下载科技需求线索单/意向单文件

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -5,6 +5,8 @@ public class AFTConstants {
 
 	public static final String	YYYYMMDD			= "yyyy-MM-dd";
 
+	public static final String	INITIALPASSWORD		= "123456";				// 初始密码
+
 	public static final String	SUPERADMIN			= "999999";				// 超级管理员
 
 	public static final String	AREAADMIN			= "99999";				// 地区管理员

+ 2 - 3
src/main/java/com/goafanti/common/enums/AchievementOrderStatus.java

@@ -13,9 +13,8 @@ public enum AchievementOrderStatus {
 	CONTRACTMONEY(3, "交付合同金"),
 	COMMISSION(4,"交付佣金"),
 	SERVICEMONEY(5, "交付服务金"),
-	SHUTDOWNUNSIGN(6,"关闭(未签合同)"),
-	SHUTDOWN(7,"关闭(已签合同)"),
-	OTHER(8, "其他");
+	SHUTDOWN(6,"关闭"),
+	OTHER(7, "其他");
 
 	private AchievementOrderStatus(Integer code, String desc) {
 		this.code = code;

+ 1 - 2
src/main/java/com/goafanti/common/enums/DemandOrderStatus.java

@@ -12,8 +12,7 @@ public enum DemandOrderStatus {
 	CONTRACTMONEY(3, "交付合同金"),
 	COMMISSION(4,"交付佣金"),
 	SERVICEMONEY(5, "交付服务金"),
-	SHUTDOWNUNSIGN(6,"关闭(未签合同)"),
-	SHUTDOWN(7,"关闭(已签合同)"),
+	SHUTDOWN(6,"关闭"),
 	OTHER(8, "其他");
 
 	private DemandOrderStatus(Integer code, String desc) {

+ 28 - 4
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -11,9 +11,12 @@
     <result column="number" property="number" jdbcType="INTEGER" />
     <result column="province" property="province" jdbcType="VARCHAR" />
     <result column="position" property="position" jdbcType="VARCHAR" />
+    <result column="superior_id" property="superiorId" jdbcType="VARCHAR" />
+    <result column="city" property="city" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, mobile, name, password, email, create_time, number, province, position
+    id, mobile, name, password, email, create_time, number, province, position, superior_id,
+    city
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -28,10 +31,11 @@
   <insert id="insert" parameterType="com.goafanti.common.model.Admin" >
     insert into admin (id, mobile, name, 
       password, email, create_time, 
-      number, province, position)
+      number, province, position, superior_id)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}
+      #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR},
+      #{superiorId,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Admin" >
@@ -64,6 +68,12 @@
       <if test="position != null" >
         position,
       </if>
+      <if test="superiorId != null" >
+        superior_id,
+      </if>
+      <if test="city != null" >
+        city,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -93,6 +103,12 @@
       <if test="position != null" >
         #{position,jdbcType=VARCHAR},
       </if>
+      <if test="superiorId != null" >
+        #{superiorId,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        #{city,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Admin" >
@@ -122,6 +138,12 @@
       <if test="position != null" >
         position = #{position,jdbcType=VARCHAR},
       </if>
+      <if test="superiorId != null" >
+        superior_id = #{superiorId,jdbcType=VARCHAR},
+      </if>
+       <if test="city != null" >
+        city = #{city,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -134,7 +156,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       number = #{number,jdbcType=INTEGER},
       province = #{province,jdbcType=VARCHAR},
-      position = #{position,jdbcType=VARCHAR}
+      position = #{position,jdbcType=VARCHAR},
+      superior_id = #{superiorId,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

+ 25 - 0
src/main/java/com/goafanti/common/model/Admin.java

@@ -50,7 +50,32 @@ public class Admin extends BaseModel implements AftUser {
 	 * 职位
 	 */
 	private String				position;
+
+	/**
+	 * 上级管理用户ID
+	 */
+	private String				superiorId;
+
+	/**
+	 * 所在市
+	 */
+	private String				city;
 	
+	public String getSuperiorId() {
+		return superiorId;
+	}
+
+	public void setSuperiorId(String superiorId) {
+		this.superiorId = superiorId;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
 
 	public String getPosition() {
 		return position;

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandOrderService.java

@@ -19,7 +19,7 @@ public interface DemandOrderService {
 
 	Pagination<DemandOrderListBo> listOrderList(Integer status, Integer pNo, Integer pSize);
 
-	int updateShutdownByUser(DemandOrder order, Boolean unSign);
+	int updateShutdownByUser(DemandOrder order);
 
 	List<DemandOrder> selectDemandOrderByDemandId(String string);
 

+ 11 - 6
src/main/java/com/goafanti/demand/service/impl/DemandOrderServiceImpl.java

@@ -80,12 +80,17 @@ public class DemandOrderServiceImpl extends BaseMybatisDao<DemandOrderMapper> im
 	}
 
 	@Override
-	public int updateShutdownByUser(DemandOrder order, Boolean unSign) {
-		if (unSign) {
-			order.setStatus(DemandOrderStatus.SHUTDOWNUNSIGN.getCode());
-		} else {
-			order.setStatus(DemandOrderStatus.SHUTDOWN.getCode());
-		}
+	public int updateShutdownByUser(DemandOrder order) {
+		order.setStatus(DemandOrderStatus.SHUTDOWN.getCode());
+		
+		DemandOrderLog dol = new DemandOrderLog();
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		dol.setId(UUID.randomUUID().toString());
+		dol.setStatus(DemandOrderStatus.SHUTDOWN.getCode());
+		dol.setDemandOrderId(order.getId());
+		dol.setRecordTime(now.getTime());
+		demandOrderLogMapper.insert(dol);
 		return demandOrderMapper.updateByPrimaryKey(order);
 	}
 

+ 2 - 2
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -101,7 +101,7 @@ public class PortalOrderApiController extends CertifyApiController {
 			return res;
 		}
 
-		res.setData(achievementOrderService.updateShutdownByUser(order, true));
+		res.setData(achievementOrderService.updateShutdownByUser(order));
 		
 		return res;
 	}
@@ -298,7 +298,7 @@ public class PortalOrderApiController extends CertifyApiController {
 			return res;
 		}
 
-		res.setData(demandOrderService.updateShutdownByUser(order, true));
+		res.setData(demandOrderService.updateShutdownByUser(order));
 		return res;
 	}