Antiloveg 8 jaren geleden
bovenliggende
commit
2573c542e9

+ 8 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -23,6 +23,7 @@ import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.cognizance.bo.CultivationListBo;
 import com.goafanti.cognizance.service.OrgCognizanceService;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.CopyrightInfoMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgCognizanceLogMapper;
@@ -32,6 +33,7 @@ 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.ContractBusinessStatus;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
@@ -68,6 +70,8 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	private PatentInfoMapper				patentInfoMapper;
 	@Autowired
 	private TechProjectMapper				techProjectMapper;
+	@Autowired
+	private ContractMapper					contractMapper;
 
 	@Override
 	public OrgCognizance insert(OrgCognizance c) {
@@ -394,7 +398,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	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());
@@ -441,6 +445,9 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		
 		orgCognizanceMapper.insert(oc);
 		orgCognizanceLogMapper.insert(ocl);
+		
+		c.setCognizanceStatus(ContractBusinessStatus.CREATE.getCode());
+		contractMapper.updateByPrimaryKeySelective(c);
 	}
 
 }

+ 4 - 4
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -188,7 +188,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		cl.setRecordTime(now.getTime());
-		cl.setStatus(c.getStatus());
+		cl.setStatus(ContractStatus.CREATE.getCode());
 		cl.setCid(c.getId());
 		return cl;
 	}
@@ -221,15 +221,15 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		c.setSignDate(signDate);
 		contractMapper.updateByPrimaryKeySelective(c);
 
-		ContractLog clog = disposeContractLog(c);
+		/*ContractLog clog = disposeContractLog(c);
 		clog.setStatus(ContractStatus.SIGN.getCode());
 		clog.setRecordTime(signDate);
 		clog.setOperator(TokenManager.getAdminId());
-		clog.setPrincipal(TokenManager.getAdminId());
+		clog.setPrincipal(TokenManager.getAdminId());*/
 
 		List<ContractLog> logs = new ArrayList<>();
 		List<Notice> notice = new ArrayList<>();
-		logs.add(clog);
+		//logs.add(clog);
 
 		for (int i = 0; i < principals.length; i++) {
 			ContractLog log = disposeContractLog(c);