Browse Source

会员子项目开发

anderx 3 years ago
parent
commit
1a02b55604

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -26,7 +26,7 @@ public interface TOrderTaskMapper {
 
     List<TOrderTaskBo> selectOrderTask(@Param("orderNo") String orderNo,@Param("type") Integer type);
 
-    TOrderTaskDetailBo getOrderTaskDetail(String id);
+    TOrderTaskDetailBo getOrderTaskDetail(Integer id);
 
     TOrderTask selectBySuperId(String superId);
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1195,7 +1195,7 @@
   <select id="splitProjectList" resultType="com.goafanti.order.bo.TOrderTaskListBo">
     select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,
             e.contract_no contractNo,a.task_receiver taskReceiver, a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-            a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus, ifnull(i.alreadyNumber,0) as alreadyNumber,
+            a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus, ifnull(i.alreadyNumber,0) as alreadyNumber,a.task_comment taskComment ,
             f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper,
             date_format(a.split_time,'%Y-%m-%d %H:%i:%S') splitTimes,ad.name splitAname,a.split_id splitId,a.patent_type  patentType,
             ttm.service_life serviceLife,ttm.service_year serviceYear ,ttm.year_sum yearSum ,ttm.contract_term contractTerm

+ 10 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -94,6 +94,16 @@ public class TOrderTaskListBo {
 	 */
 	private String contractTerm;
 
+	private String taskComment;
+
+	public String getTaskComment() {
+		return taskComment;
+	}
+
+	public void setTaskComment(String taskComment) {
+		this.taskComment = taskComment;
+	}
+
 	public String getServiceLife() {
 		return serviceLife;
 	}

+ 1 - 3
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -127,7 +127,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务详情
 	 */
 	@RequestMapping(value="/orderTaskDetail" ,method = RequestMethod.GET)
-	public Result orderTaskDetail(String id){
+	public Result orderTaskDetail(Integer id){
 		Result res=new Result();
 		res.setData(orderProjectService.orderTaskDetail(id));
 		return res;
@@ -609,6 +609,4 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	}
 
-
-
 }

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -26,7 +26,7 @@ public interface OrderNewService {
 	 * 创建项目
 	 * @param t
 	 */
-	int addOrderTask(InputAddTask t);
+	InputAddTask addOrderTask(InputAddTask t);
 
 	int addMemberProject(InputAddTask t);
 	/**

+ 2 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -25,7 +25,7 @@ public interface OrderProjectService {
 
 	Pagination<TOrderTaskListBo> orderTaskList(inuptTaskListBo ib);
 
-	TOrderTaskDetailBo orderTaskDetail(String id);
+	TOrderTaskDetailBo orderTaskDetail(Integer id);
 
 	int updateOrderTask(TOrderTaskDetailBo t);
 
@@ -104,7 +104,7 @@ public interface OrderProjectService {
 	 * @param type 0首次新增 1会员新增
 	 * @return
 	 */
-    int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer type,String pictureUrl);
+	TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer type,String pictureUrl);
 
 	/**
 	 *

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -186,7 +186,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int addOrderTask(InputAddTask t) {
+	public InputAddTask addOrderTask(InputAddTask t) {
 		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		checkOrder(order,t);
 		t.setTaskStatus(TaskState.WFP.getCode());
@@ -207,7 +207,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tTaskMemberMapper.insertSelective(ttm);
 		}
 		addTaskMid(t.getId(),t.getCommodityId(), order.getOrderNo());
-		return 1;
+		return t;
 	}
 	@Override
 	public int addTaskMid(Integer id,String commodityId, String orderNo) {
@@ -1715,7 +1715,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public boolean checkOfficialType(TOrderOutsource o) {
-		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(o.getTid().toString());
+		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(o.getTid());
 		//项目类型是专利不是转让就需要获取专利官费
 		if(t.getPatentTransfer()==0){
 			if(t.getBpType()==1) {

+ 8 - 6
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -353,7 +353,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
-	public TOrderTaskDetailBo orderTaskDetail(String id) {
+	public TOrderTaskDetailBo orderTaskDetail(Integer id) {
 		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(id);
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
 				||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.TECH_ADMIN)
@@ -1201,9 +1201,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 
 	@Override
-	public int addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
+	public TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
 		Date date =new Date();
-		TOrderTask tOrderTask = tOrderTaskMapper.selectByPrimaryKey(tid);
+		TOrderTaskBo tOrderTask = (TOrderTaskBo) tOrderTaskMapper.selectByPrimaryKey(tid);
 		tOrderTask.setSplitStatus(1);
 		tOrderTask.setSplitAid(TokenManager.getAdminId());
 		tOrderTask.setSplitTime(date);
@@ -1220,14 +1220,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		i++;
 		tOrderTask.setSplitId(i);
 		tOrderTask.setCommodityQuantity(1);
+		tOrderTask.setTaskComment(taskComment);
 		tOrderTaskMapper.insertSelective(tOrderTask);
 		TTaskMember t = tTaskMemberMapper.selectByTid(tid);
-		if (t.getServiceLife()!=null||t.getServiceYear()!=null||t.getYearSum()!=null||t.getContractTerm()!=null){
+		if (t.getServiceLife()!=null||t.getYearSum()!=null||t.getContractTerm()!=null||serviceYear!=null){
 			TTaskMember ttm=new TTaskMember();
 			ttm.setId(null);
 			ttm.setTid(tOrderTask.getId());
 			if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
-			if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
+			ttm.setServiceYear(serviceYear);
+			tOrderTask.setServiceYear(serviceYear);
 			if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
@@ -1235,7 +1237,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
 		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
-		return 1;
+		return tOrderTask;
 	}
 	public void addNoticMember(Integer type,  String orderNo,Integer shiroType,Integer result) {
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);

+ 1 - 1
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -582,7 +582,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public boolean checkprojectDun(TOrderPayment p) {
 		PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
-		TOrderTaskDetailBo tt=tOrderTaskMapper.getOrderTaskDetail(p.getTid().toString());
+		TOrderTaskDetailBo tt=tOrderTaskMapper.getOrderTaskDetail(p.getTid());
 //		项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,7-项目下证,8-项目验收,
 //		9-项目拨款 10- 项目进度10% 11- 项目进度30% 12- 项目进度70%
 		if(pn.getDunType()==1) {