Antiloveg 8 lat temu
rodzic
commit
5355933a4b

+ 7 - 2
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -2967,6 +2967,11 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(cog.getSalesman())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
+			return res;
+		}
 
 		if (null == cog.getYear()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "年份"));
@@ -3004,10 +3009,10 @@ public class AdminApiController extends CertifyApiController {
 			}
 
 		}
-
+		String salesman = cog.getSalesman();
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);
-		orgCognizanceService.insertCognizance(oc, TokenManager.getAdminId());
+		orgCognizanceService.saveCognizance(oc, salesman);
 
 		return res;
 	}

+ 6 - 5
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -104,18 +104,19 @@ public class AdminCopyrightApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		if (StringUtils.isBlank(inputInfo.getSalesman())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
+			return res;
+		}
 		User curUser = userService.selectByPrimaryKey(inputInfo.getUid());
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
+		String salesman = inputInfo.getSalesman();
 		CopyrightInfo ci = new CopyrightInfo();
 		BeanUtils.copyProperties(inputInfo, ci);
 		ci.setUid(curUser.getId());
-		ci.setStatus(CopyrightStatus.CREATE.getCode());
-		if (TokenManager.getToken() instanceof Admin) {
-			ci.setPrincipal(TokenManager.getAdminId());
-		}
-		copyrightInfoService.insert(ci, curUser.getAid());
+		copyrightInfoService.saveCopyright(ci, salesman);
 		res.setData(ci);
 		return res;
 	}

+ 13 - 0
src/main/java/com/goafanti/cognizance/bo/InputApplyCognizance.java

@@ -32,6 +32,19 @@ public class InputApplyCognizance {
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer largeOrder;
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String salesman;
+	
+	
+
+	public String getSalesman() {
+		return salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		this.salesman = salesman;
+	}
 
 	public Integer getContacts() {
 		return contacts;

+ 0 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -2322,7 +2322,6 @@ public class CognizanceApiController extends CertifyApiController {
 
 		}
 
-		
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);
 		oc.setUid(TokenManager.getUserId());

+ 3 - 1
src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java

@@ -43,7 +43,7 @@ public interface OrgCognizanceService {
 
 	void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid);
 
-	void insertCognizance(OrgCognizance cog, String aid);
+	OrgCognizance insertCognizance(OrgCognizance cog, String aid);
 
 	Pagination<CultivationListBo> listCultivation(String uid, String province, String unitName, Integer pNo, Integer pSize);
 
@@ -53,5 +53,7 @@ public interface OrgCognizanceService {
 
 	BusinessCountBo countBusiness(String uid);
 
+	OrgCognizance saveCognizance(OrgCognizance oc, String salesman);
+
 
 }

+ 51 - 22
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -32,12 +32,11 @@ import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.TechProjectMapper;
 import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.CopyrightStatus;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrgCognizanceStatus;
 import com.goafanti.common.enums.ProportionStatus;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.common.model.OrgCognizanceLog;
@@ -244,32 +243,18 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	}
 
 	@Override
-	public void insertCognizance(OrgCognizance c, String aid) {
-		c.setId(UUID.randomUUID().toString());
-		c.setState(CopyrightStatus.CREATE.getCode());
-		c.setDeletedSign(0);
-		if (TokenManager.getToken() instanceof Admin) {
-			c.setFounder(TokenManager.getAdminId());
-		}
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		c.setRecordTime(now.getTime());
-		orgCognizanceMapper.insert(c);
+	public OrgCognizance saveCognizance(OrgCognizance c, String salesman) {
+		c.setState(OrgCognizanceStatus.DELIVERD.getCode());
+		c.setFounder(salesman);
+		c = disposeCognizanceSave(c);
 
 		OrgCognizanceLog log = new OrgCognizanceLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setCid(c.getId());
-
 		log.setRecordTime(c.getRecordTime());
 		log.setState(c.getState());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setPrincipal(TokenManager.getAdminId());
-		} else {
-			log.setPrincipal(aid);
-		}
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setOperator(TokenManager.getAdminId());
-		}
+		log.setPrincipal(salesman);
+		log.setOperator(salesman);
 		log.setComment(c.getComment());
 		orgCognizanceLogMapper.insert(log);
 
@@ -285,6 +270,29 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			orgCognizanceProportionMapper.updateByPrimaryKeySelective(disposeProportion(ocp));
 		}
 
+		OrgCognizanceLog l = new OrgCognizanceLog();
+		l.setId(UUID.randomUUID().toString());
+		l.setCid(c.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		l.setRecordTime(now.getTime());
+		l.setState(c.getState());
+		l.setPrincipal(TokenManager.getAdminId());
+		l.setOperator(salesman);
+		orgCognizanceLogMapper.insert(l);
+
+		createNotice(c, l);
+		return c;
+	}
+
+	private OrgCognizance disposeCognizanceSave(OrgCognizance c) {
+		c.setId(UUID.randomUUID().toString());
+		c.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		c.setRecordTime(now.getTime());
+		orgCognizanceMapper.insert(c);
+		return c;
 	}
 
 	@SuppressWarnings("unchecked")
@@ -381,4 +389,25 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public OrgCognizance insertCognizance(OrgCognizance c, String aid) {
+		c.setState(OrgCognizanceStatus.CREATE.getCode());
+		c = disposeCognizanceSave(c);
+		
+		OrgCognizanceLog log = new OrgCognizanceLog();
+		log.setId(UUID.randomUUID().toString());
+		log.setCid(c.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		log.setRecordTime(now.getTime());
+		log.setState(OrgCognizanceStatus.CREATE.getCode());
+		log.setPrincipal(aid);
+		log.setComment(c.getComment());
+		orgCognizanceLogMapper.insert(log);
+
+		createNotice(c, log);
+		return c;
+
+	}
+
 }

+ 1 - 0
src/main/java/com/goafanti/common/enums/CognizanceApplyFields.java

@@ -11,6 +11,7 @@ public enum CognizanceApplyFields {
 	CONSULTANT("consultant", "咨询师"),
 	YEAR("year", "年份"),
 	STATE("state", "状态"),
+	SALESMAN("salesman", "营销员"),
 	
 	OTHER("", "未知参数");
 	

+ 1 - 0
src/main/java/com/goafanti/common/enums/CopyrightFields.java

@@ -18,6 +18,7 @@ public enum CopyrightFields {
 	INURGENT("inUrgent", "加急天数"),
 	AUTHORIZEDDATE("authorizedDate", "下证日期"),
 	RECORDTIME("recordTime", "状态流转时间"),
+	SALESMAN("salesman", "营销员"),
 	OTHER("", "未知参数");
 
 	private CopyrightFields(String code, String desc) {

+ 12 - 0
src/main/java/com/goafanti/copyright/bo/InputCopyright.java

@@ -46,6 +46,18 @@ public class InputCopyright {
 
 	@Past(message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Date	recordTime;
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String salesman;
+	
+	
+
+	public String getSalesman() {
+		return salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		this.salesman = salesman;
+	}
 
 	public String getPrincipal() {
 		return principal;

+ 0 - 6
src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java

@@ -56,12 +56,6 @@ public class CopyrightApiController extends CertifyApiController {
 		BeanUtils.copyProperties(inputInfo, ci);
 		ci.setUid(curUser.getId());
 		ci.setPrincipal(curUser.getAid());
-		/*if (StringUtils.isBlank(ci.getPrincipal())) {
-			ci.setStatus(CopyrightStatus.CREATE.getCode());
-			ci.setPrincipal(curUser.getAid());
-		} else {
-			ci.setStatus(CopyrightStatus.DELIVERD.getCode());
-		}*/
 		copyrightInfoService.insert(ci, curUser.getAid());
 		res.setData(ci);
 		return res;

+ 2 - 0
src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java

@@ -36,4 +36,6 @@ public interface CopyrightInfoService {
 
 	int batchCirculation(String[] ids, String recordTimeFormattedDate, CopyrightLog cl);
 
+	CopyrightInfo saveCopyright(CopyrightInfo ci, String salesman);
+
 }

+ 33 - 12
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -26,7 +26,6 @@ import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.CopyrightInfo;
 import com.goafanti.common.model.CopyrightLog;
 import com.goafanti.common.model.Notice;
@@ -58,21 +57,12 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		copyrightInfo.setCreateTime(now.getTime());
-		if (TokenManager.getToken() instanceof Admin) {
-			copyrightInfo.setFounder(TokenManager.getAdminId());
-		}
+		copyrightInfo.setStatus(CopyrightStatus.CREATE.getCode());
 		CopyrightLog log = new CopyrightLog();
 		log.setCid(copyrightInfo.getId());
 		log.setRecordTime(copyrightInfo.getCreateTime());
 		log.setComment(copyrightInfo.getComment());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setOperator(TokenManager.getAdminId());
-		}
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setPrincipal(TokenManager.getAdminId());
-		} else {
-			log.setPrincipal(aid);
-		}
+		log.setPrincipal(aid);
 		log.setStatus(copyrightInfo.getStatus());
 		copyrightInfoMapper.insertSelective(copyrightInfo);
 		copyrightLogMapper.insertSelective(log);
@@ -277,4 +267,35 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public CopyrightInfo saveCopyright(CopyrightInfo copyrightInfo, String salesman) {
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		copyrightInfo.setCreateTime(now.getTime());
+		copyrightInfo.setFounder(salesman);
+		copyrightInfo.setStatus(CopyrightStatus.DELIVERD.getCode());
+		copyrightInfo.setPrincipal(TokenManager.getAdminId());
+
+		CopyrightLog log = new CopyrightLog();
+		log.setCid(copyrightInfo.getId());
+		log.setRecordTime(copyrightInfo.getCreateTime());
+		log.setComment(copyrightInfo.getComment());
+		log.setOperator(salesman);
+		log.setPrincipal(salesman);
+		log.setStatus(CopyrightStatus.CREATE.getCode());
+
+		copyrightInfoMapper.insertSelective(copyrightInfo);
+		copyrightLogMapper.insertSelective(log);
+		createNotice(copyrightInfo, log);
+
+		CopyrightLog l = new CopyrightLog();
+		l.setCid(copyrightInfo.getId());
+		l.setRecordTime(now.getTime());
+		l.setOperator(salesman);
+		l.setPrincipal(TokenManager.getAdminId());
+		l.setStatus(CopyrightStatus.DELIVERD.getCode());
+		createNotice(copyrightInfo, l);
+		return copyrightInfo;
+	}
+
 }