Browse Source

项目进度详情开发

anderx 1 year ago
parent
commit
14d4efd7d7

+ 29 - 578
src/main/java/com/goafanti/techproject/bo/TaskDetailsBo.java

@@ -1,610 +1,61 @@
 package com.goafanti.techproject.bo;
 
 import com.goafanti.common.model.TaskDetails;
+import com.goafanti.order.bo.TOrderTaskBo;
 
-import java.math.BigDecimal;
+import java.util.List;
 
 public class TaskDetailsBo extends TaskDetails {
-
-    /**
-     * 研发准备金备案 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer rdReservesStatus;
-    /**
-     * 研发准备金备其他说明
-     */
-    private String rdReservesOther;
-    /**
-     * 研发奖补申请 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer rdAwardCompensationStatus;
-    /**
-     * 研发准备金备其他说明
-     */
-    private String rdAwardCompensationOther;
-    /**
-     * 研发奖补-申请金额
-     */
-    private BigDecimal rdApplicationFee;
-    /**
-     * 研发奖补-公示金额
-     */
-    private BigDecimal rdAnnouncementAmount;
-    /**
-     * 研发奖补-公示金额-其他
-     */
-    private String rdAnnouncementOther;
-    /**
-     * 加扣备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer adDeliverStatus;
-    /**
-     * 加扣备查交付其他说明
-     */
-    private String adDeliverOther;
-    /**
-     * 加扣备查交付归档 0=否,1=是
-     */
-    private Integer adDeliverFinish;
-    /**
-     * 高新备查交付 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer htDeliverStatus;
-    /**
-     * 高新加扣备查交付其他说明
-     */
-    private String htDeliverOther;
-    /**
-     * 高新加扣备查交付归档 0=否,1=是
-     */
-    private Integer htDeliverFinish;
-    /**
-     * 召开上年度总结与本年工作计划会议 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer closeMeetingStatus;
-    /**
-     * 召开上年度总结与本年工作计划会议其他说明
-     */
-    private String closeMeeting_Other;
-    /**
-     * 阶段性汇报 1=月度,2=季度
-     */
-    private Integer phasedType;
-    /**
-     * 阶段性汇报 1,2,3=选取1月到3月
-     */
-    private String phasedContent;
+    private String orderNo;
+    private String contractNo;
     /**
-     * 立项资料编写数
+     * 会员  0否 1是
      */
-    private Integer projectApprovalWriteNumber;
+    private Integer memberStatus;
     /**
-     * 立项资料编写完成率
+     * 会员等级
      */
-    private Double projectApprovalWriteRate;
-    /**
-     * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer adPrepareJulyStatus;
-    /**
-     * 加扣预申报七月其他说明
-     */
-    private String adPrepareJulyOther;
-    /**
-     * 加扣预申报七月 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer adPrepareOctoberStatus;
-    /**
-     * 加扣预申报十月其他说明
-     */
-    private String adPrepareOctoberOther;
-    /**
-     * 知识产权申报数
-     */
-    private Integer ipDeclare;
-    /**
-     * 知识产权授权数
-     */
-    private Integer ipAuthorize;
-    /**
-     * 知识产权高新数
-     */
-    private Integer ipHt;
-    /**
-     * 知识产权高新I数
-     */
-    private Integer ipHtI;
-    /**
-     * 知识产权高新II数
-     */
-    private Integer ipHtIi;
-    /**
-     * 委外开发项目数
-     */
-    private Integer outsourcingDev;
-    /**
-     * 技术开发合同登记数
-     */
-    private Integer contractRegistration;
-    /**
-     * 公出约定次数
-     */
-    private Integer publicReleaseStipulation;
-    /**
-     * 公出实际次数
-     */
-    private Integer publicReleaseActual;
-    /**
-     * 培训约定次数
-     */
-    private Integer trainingStipulation;
-    /**
-     * 培训实际次数
-     */
-    private Integer trainingActual;
-    /**
-     * 培训其他说明
-     */
-    private String trainingOther;
-    /**
-     * 专项检查数
-     */
-    private Integer specialInspect;
-    /**
-     * 模拟稽查数
-     */
-    private Integer simulatedAudit;
-    /**
-     * 特色工作-其他
-     */
-    private String featuredWorkOther;
-    /**
-     * 高新认定评价估分
-     */
-    private Integer htScore;
-    /**
-     * 高新认定评申报批次
-     */
-    private Integer htBatch;
-    /**
-     * 高新认定重点关注 0=否,1=是
-     */
-    private Integer htFocus;
-    /**
-     * 网上系统提交 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer webSubmit;
-    /**
-     * 网上系统提交其他说明
-     */
-    private String webSubmitOther;
-    /**
-     * 纸质材料提交 0=其他,1=待完成,2=已完成,3=合同无此项
-     */
-    private Integer paperSubmit;
-    /**
-     * 纸质材料提交其他说明
-     */
-    private String paperSubmitOther;
-    /**
-     * 评审省级 0=淘汰,1=公示
-     */
-    private Integer reviewProvince;
-    /**
-     * 评审国家级 0=淘汰,1=公示
-     */
-    private Integer reviewCountry;
-    /**
-     * 评审省级序号
-     */
-    private Integer reviewProvinceNumber;
-    /**
-     * 评审国家级高企编号
-     */
-    private Integer reviewCountryNumber;
-    /**
-     * 备注说明
-     */
-    private String remarks;
+    private String memberLvl;
 
+    List<TOrderTaskBo> taskList;
 
-    public Integer getRdReservesStatus() {
-        return rdReservesStatus;
-    }
-
-    public void setRdReservesStatus(Integer rdReservesStatus) {
-        this.rdReservesStatus = rdReservesStatus;
-    }
-
-    public String getRdReservesOther() {
-        return rdReservesOther;
-    }
-
-    public void setRdReservesOther(String rdReservesOther) {
-        this.rdReservesOther = rdReservesOther;
-    }
-
-    public Integer getRdAwardCompensationStatus() {
-        return rdAwardCompensationStatus;
-    }
-
-    public void setRdAwardCompensationStatus(Integer rdAwardCompensationStatus) {
-        this.rdAwardCompensationStatus = rdAwardCompensationStatus;
-    }
-
-    public String getRdAwardCompensationOther() {
-        return rdAwardCompensationOther;
-    }
-
-    public void setRdAwardCompensationOther(String rdAwardCompensationOther) {
-        this.rdAwardCompensationOther = rdAwardCompensationOther;
-    }
-
-    public BigDecimal getRdApplicationFee() {
-        return rdApplicationFee;
-    }
-
-    public void setRdApplicationFee(BigDecimal rdApplicationFee) {
-        this.rdApplicationFee = rdApplicationFee;
-    }
-
-    public BigDecimal getRdAnnouncementAmount() {
-        return rdAnnouncementAmount;
-    }
-
-    public void setRdAnnouncementAmount(BigDecimal rdAnnouncementAmount) {
-        this.rdAnnouncementAmount = rdAnnouncementAmount;
-    }
-
-    public Integer getAdDeliverStatus() {
-        return adDeliverStatus;
-    }
-
-    public void setAdDeliverStatus(Integer adDeliverStatus) {
-        this.adDeliverStatus = adDeliverStatus;
-    }
-
-    public String getAdDeliverOther() {
-        return adDeliverOther;
-    }
-
-    public void setAdDeliverOther(String adDeliverOther) {
-        this.adDeliverOther = adDeliverOther;
-    }
-
-    public Integer getAdDeliverFinish() {
-        return adDeliverFinish;
-    }
-
-    public void setAdDeliverFinish(Integer adDeliverFinish) {
-        this.adDeliverFinish = adDeliverFinish;
-    }
-
-    public Integer getHtDeliverStatus() {
-        return htDeliverStatus;
-    }
-
-    public void setHtDeliverStatus(Integer htDeliverStatus) {
-        this.htDeliverStatus = htDeliverStatus;
-    }
-
-    public String getHtDeliverOther() {
-        return htDeliverOther;
-    }
-
-    public void setHtDeliverOther(String htDeliverOther) {
-        this.htDeliverOther = htDeliverOther;
-    }
-
-    public Integer getHtDeliverFinish() {
-        return htDeliverFinish;
-    }
-
-    public void setHtDeliverFinish(Integer htDeliverFinish) {
-        this.htDeliverFinish = htDeliverFinish;
-    }
-
-    public Integer getCloseMeetingStatus() {
-        return closeMeetingStatus;
-    }
-
-    public void setCloseMeetingStatus(Integer closeMeetingStatus) {
-        this.closeMeetingStatus = closeMeetingStatus;
-    }
-
-    public String getCloseMeeting_Other() {
-        return closeMeeting_Other;
-    }
-
-    public void setCloseMeeting_Other(String closeMeeting_Other) {
-        this.closeMeeting_Other = closeMeeting_Other;
-    }
-
-    public Integer getPhasedType() {
-        return phasedType;
-    }
-
-    public void setPhasedType(Integer phasedType) {
-        this.phasedType = phasedType;
-    }
-
-    public String getPhasedContent() {
-        return phasedContent;
-    }
-
-    public void setPhasedContent(String phasedContent) {
-        this.phasedContent = phasedContent;
-    }
-
-    public Integer getAdPrepareJulyStatus() {
-        return adPrepareJulyStatus;
-    }
-
-    public void setAdPrepareJulyStatus(Integer adPrepareJulyStatus) {
-        this.adPrepareJulyStatus = adPrepareJulyStatus;
-    }
-
-    public String getAdPrepareJulyOther() {
-        return adPrepareJulyOther;
-    }
-
-    public void setAdPrepareJulyOther(String adPrepareJulyOther) {
-        this.adPrepareJulyOther = adPrepareJulyOther;
-    }
-
-    public Integer getAdPrepareOctoberStatus() {
-        return adPrepareOctoberStatus;
-    }
-
-    public void setAdPrepareOctoberStatus(Integer adPrepareOctoberStatus) {
-        this.adPrepareOctoberStatus = adPrepareOctoberStatus;
-    }
-
-    public String getAdPrepareOctoberOther() {
-        return adPrepareOctoberOther;
-    }
-
-    public void setAdPrepareOctoberOther(String adPrepareOctoberOther) {
-        this.adPrepareOctoberOther = adPrepareOctoberOther;
-    }
-
-    public Integer getIpDeclare() {
-        return ipDeclare;
-    }
-
-    public void setIpDeclare(Integer ipDeclare) {
-        this.ipDeclare = ipDeclare;
-    }
-
-    public Integer getIpAuthorize() {
-        return ipAuthorize;
-    }
-
-    public void setIpAuthorize(Integer ipAuthorize) {
-        this.ipAuthorize = ipAuthorize;
-    }
-
-    public Integer getIpHt() {
-        return ipHt;
-    }
-
-    public void setIpHt(Integer ipHt) {
-        this.ipHt = ipHt;
-    }
-
-    public Integer getIpHtI() {
-        return ipHtI;
-    }
-
-    public void setIpHtI(Integer ipHtI) {
-        this.ipHtI = ipHtI;
-    }
-
-    public Integer getIpHtIi() {
-        return ipHtIi;
-    }
-
-    public void setIpHtIi(Integer ipHtIi) {
-        this.ipHtIi = ipHtIi;
-    }
-
-    public Integer getOutsourcingDev() {
-        return outsourcingDev;
-    }
-
-    public void setOutsourcingDev(Integer outsourcingDev) {
-        this.outsourcingDev = outsourcingDev;
-    }
-
-    public Integer getContractRegistration() {
-        return contractRegistration;
-    }
-
-    public void setContractRegistration(Integer contractRegistration) {
-        this.contractRegistration = contractRegistration;
-    }
-
-    public Integer getPublicReleaseStipulation() {
-        return publicReleaseStipulation;
-    }
-
-    public void setPublicReleaseStipulation(Integer publicReleaseStipulation) {
-        this.publicReleaseStipulation = publicReleaseStipulation;
-    }
-
-    public Integer getPublicReleaseActual() {
-        return publicReleaseActual;
-    }
-
-    public void setPublicReleaseActual(Integer publicReleaseActual) {
-        this.publicReleaseActual = publicReleaseActual;
-    }
-
-    public Integer getTrainingStipulation() {
-        return trainingStipulation;
-    }
-
-    public void setTrainingStipulation(Integer trainingStipulation) {
-        this.trainingStipulation = trainingStipulation;
-    }
-
-    public Integer getTrainingActual() {
-        return trainingActual;
-    }
-
-    public void setTrainingActual(Integer trainingActual) {
-        this.trainingActual = trainingActual;
-    }
-
-    public String getTrainingOther() {
-        return trainingOther;
-    }
-
-    public void setTrainingOther(String trainingOther) {
-        this.trainingOther = trainingOther;
-    }
-
-    public Integer getSpecialInspect() {
-        return specialInspect;
-    }
-
-    public void setSpecialInspect(Integer specialInspect) {
-        this.specialInspect = specialInspect;
-    }
-
-    public Integer getSimulatedAudit() {
-        return simulatedAudit;
-    }
-
-    public void setSimulatedAudit(Integer simulatedAudit) {
-        this.simulatedAudit = simulatedAudit;
-    }
-
-    public Integer getHtScore() {
-        return htScore;
-    }
-
-    public void setHtScore(Integer htScore) {
-        this.htScore = htScore;
-    }
-
-    public Integer getHtBatch() {
-        return htBatch;
-    }
-
-    public void setHtBatch(Integer htBatch) {
-        this.htBatch = htBatch;
-    }
-
-    public Integer getHtFocus() {
-        return htFocus;
-    }
-
-    public void setHtFocus(Integer htFocus) {
-        this.htFocus = htFocus;
-    }
-
-    public Integer getWebSubmit() {
-        return webSubmit;
-    }
-
-    public void setWebSubmit(Integer webSubmit) {
-        this.webSubmit = webSubmit;
-    }
-
-    public String getWebSubmitOther() {
-        return webSubmitOther;
-    }
-
-    public void setWebSubmitOther(String webSubmitOther) {
-        this.webSubmitOther = webSubmitOther;
-    }
-
-    public Integer getPaperSubmit() {
-        return paperSubmit;
-    }
-
-    public void setPaperSubmit(Integer paperSubmit) {
-        this.paperSubmit = paperSubmit;
-    }
-
-    public String getPaperSubmitOther() {
-        return paperSubmitOther;
-    }
-
-    public void setPaperSubmitOther(String paperSubmitOther) {
-        this.paperSubmitOther = paperSubmitOther;
-    }
-
-    public Integer getReviewProvince() {
-        return reviewProvince;
-    }
-
-    public void setReviewProvince(Integer reviewProvince) {
-        this.reviewProvince = reviewProvince;
-    }
-
-    public Integer getReviewCountry() {
-        return reviewCountry;
-    }
-
-    public void setReviewCountry(Integer reviewCountry) {
-        this.reviewCountry = reviewCountry;
-    }
-
-    public Integer getReviewProvinceNumber() {
-        return reviewProvinceNumber;
-    }
-
-    public void setReviewProvinceNumber(Integer reviewProvinceNumber) {
-        this.reviewProvinceNumber = reviewProvinceNumber;
-    }
-
-    public Integer getReviewCountryNumber() {
-        return reviewCountryNumber;
-    }
-
-    public void setReviewCountryNumber(Integer reviewCountryNumber) {
-        this.reviewCountryNumber = reviewCountryNumber;
-    }
-
-    public String getRdAnnouncementOther() {
-        return rdAnnouncementOther;
+    public List<TOrderTaskBo> getTaskList() {
+        return taskList;
     }
 
-    public void setRdAnnouncementOther(String rdAnnouncementOther) {
-        this.rdAnnouncementOther = rdAnnouncementOther;
+    public void setTaskList(List<TOrderTaskBo> taskList) {
+        this.taskList = taskList;
     }
 
-    public Integer getProjectApprovalWriteNumber() {
-        return projectApprovalWriteNumber;
+    public Integer getMemberStatus() {
+        return memberStatus;
     }
 
-    public void setProjectApprovalWriteNumber(Integer projectApprovalWriteNumber) {
-        this.projectApprovalWriteNumber = projectApprovalWriteNumber;
+    public void setMemberStatus(Integer memberStatus) {
+        this.memberStatus = memberStatus;
     }
 
-    public Double getProjectApprovalWriteRate() {
-        return projectApprovalWriteRate;
+    public String getMemberLvl() {
+        return memberLvl;
     }
 
-    public void setProjectApprovalWriteRate(Double projectApprovalWriteRate) {
-        this.projectApprovalWriteRate = projectApprovalWriteRate;
+    public void setMemberLvl(String memberLvl) {
+        this.memberLvl = memberLvl;
     }
 
-    public String getFeaturedWorkOther() {
-        return featuredWorkOther;
+    public String getOrderNo() {
+        return orderNo;
     }
 
-    public void setFeaturedWorkOther(String featuredWorkOther) {
-        this.featuredWorkOther = featuredWorkOther;
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
     }
 
-    public String getRemarks() {
-        return remarks;
+    public String getContractNo() {
+        return contractNo;
     }
 
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
     }
 }

+ 11 - 0
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -51,6 +51,17 @@ public class TaskDetailsController extends BaseController {
         return new Result<>().data(this.taskDetailsService.queryById(id));
     }
 
+    /**
+     * 查询项目进度页面
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/getByTid")
+    public Result<TaskDetails> getByTid(Integer id) {
+        return new Result<>().data(this.taskDetailsService.getByTid(id));
+    }
+
 
     /**
      * 编辑项目进度数据

+ 1 - 0
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -51,4 +51,5 @@ public interface TaskDetailsService {
      */
     Object list(TaskDetails in, Integer pageNo, Integer pageSize);
 
+    Object getByTid(Integer id);
 }

+ 34 - 4
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -1,13 +1,12 @@
 package com.goafanti.techproject.service.impl;
 
-import com.goafanti.common.dao.TOrderNewMapper;
-import com.goafanti.common.dao.TaskAnnualReportMapper;
-import com.goafanti.common.dao.TaskDetailsLogMapper;
-import com.goafanti.common.dao.TaskDetailsMapper;
+import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.techproject.bo.TaskDetailsBo;
 import com.goafanti.techproject.service.TaskDetailsService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -38,6 +37,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     @Resource
     private TOrderNewMapper tOrderNewMapper;
     @Resource
+    private TOrderMidMapper tOrderMidMapper;
+    @Resource
+    private TOrderTaskMapper tOrderTaskMapper;
+    @Resource
     private TaskAnnualReportMapper taskAnnualReportMapper;
 
 
@@ -49,6 +52,33 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                 "findTaskDetailsCount", params, pageNo, pageSize);
     }
 
+    @Override
+    public Object getByTid(Integer id) {
+        TaskDetails taskDetails = queryById(id);
+        TaskDetailsBo res = new TaskDetailsBo();
+        BeanUtils.copyProperties(taskDetails, res);
+        TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
+        TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
+        BigDecimal totalAmount = tOrderNew.getTotalAmount();
+        String lvl=null;
+        if (totalAmount.compareTo(new BigDecimal("3"))<0){
+            lvl="A";
+        }else if (totalAmount.compareTo(new BigDecimal("8"))<1){
+            lvl="AA";
+        }else if (totalAmount.compareTo(new BigDecimal("8"))>0){
+            lvl="AAA";
+        }
+        res.setOrderNo(tOrderNew.getOrderNo());
+        res.setContractNo(tOrderNew.getContractNo());
+        res.setMemberStatus(mid.getProjectType());
+        res.setMemberLvl(lvl);
+        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
+        res.setTaskList(tOrderTaskBos);
+
+
+        return res;
+    }
+
     /**
      * 通过ID查询单条数据
      *