Просмотр исходного кода

财务订单特批相关修改

anderx 1 год назад
Родитель
Сommit
b1260a148b

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

@@ -1526,7 +1526,7 @@
     tm.service_life serviceLife,tm.service_year serviceyear, tm.year_sum yearsum,tm.contract_term contractTerm, a.commodity_price commodityPrice ,
     a.special_comment specialComment,a.task_comment taskComment,ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,
     e.service_type serviceType,e.service_project serviceProject, a.form_retrieve formRetrieve  ,a.satisfaction_degree satisfactionDegree,
-    toa.type,toa.type_explain typeExplain
+    toa.type,toa.type_explain typeExplain,b.approval
     from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id
     left join district_glossory d on c.province=d.id left join task_progress tp  on a.id=tp.task_id left join t_task_member tm on a.id=tm.tid
     left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id

+ 9 - 1
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -74,10 +74,18 @@ public class OutProjectStatistics {
 	private BigDecimal lastYearCapital;
 	private BigDecimal lastYearIncome;
 
-
+	private Integer approval;
 	private String type;
 	private String typeExplain;
 
+	public Integer getApproval() {
+		return approval;
+	}
+
+	public void setApproval(Integer approval) {
+		this.approval = approval;
+	}
+
 	public String getType() {
 		return type;
 	}

+ 25 - 0
src/main/java/com/goafanti/order/bo/managerListBo.java

@@ -205,4 +205,29 @@ public class managerListBo {
 		this.specialComment = specialComment;
 	}
 
+	@Override
+	public String toString() {
+		return "managerListBo{" +
+				"id='" + id + '\'' +
+				", taskDistributionTime='" + taskDistributionTime + '\'' +
+				", provinceName='" + provinceName + '\'' +
+				", depName='" + depName + '\'' +
+				", salesmanName='" + salesmanName + '\'' +
+				", contractNo='" + contractNo + '\'' +
+				", orderNo='" + orderNo + '\'' +
+				", UserName='" + UserName + '\'' +
+				", cname='" + cname + '\'' +
+				", commodityName='" + commodityName + '\'' +
+				", commodityQuantity='" + commodityQuantity + '\'' +
+				", techDepName='" + techDepName + '\'' +
+				", techName='" + techName + '\'' +
+				", projectStatusName='" + projectStatusName + '\'' +
+				", projectStatus='" + projectStatus + '\'' +
+				", commodityPrice='" + commodityPrice + '\'' +
+				", specialComment='" + specialComment + '\'' +
+				", approval=" + approval +
+				", type='" + type + '\'' +
+				", typeExplain='" + typeExplain + '\'' +
+				'}';
+	}
 }

+ 36 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsAudit.java

@@ -56,6 +56,12 @@ public class OutProjectStatisticsAudit extends OutProjectStatistics {
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
 
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
+
 
     private Integer  setUpStatus;
     private String setUpTime;
@@ -80,6 +86,36 @@ public class OutProjectStatisticsAudit extends OutProjectStatistics {
     private Integer	certificatesCount;
 
     @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
+
+    @Override
     public Integer getFormRetrieve() {
         return formRetrieve;
     }

+ 35 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsCommon.java

@@ -49,6 +49,41 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private Integer formRetrieve;
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
+
+    @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
 
     @Override
     public Integer getFormRetrieve() {

+ 36 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsDoubleSoft.java

@@ -52,6 +52,42 @@ public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
 
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
+
+    @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
+
     @Override
     public Integer getFormRetrieve() {
         return formRetrieve;

+ 35 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsHighTech.java

@@ -65,6 +65,11 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private String orderRemarks;
     @Excel(name = "满意度调查表")
     private String formRetrieveName;
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
 
 
 
@@ -83,6 +88,36 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
 
     private Integer	certificatesCount;
 
+    @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
+
     public String getFormRetrieveName() {
         return formRetrieveName;
     }

+ 36 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsMember.java

@@ -50,6 +50,12 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
 
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
+
     private Integer  setUpStatus;
     private String setUpTime;
     private Integer  spotCheckStatus;
@@ -81,6 +87,36 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     private String contractTerm;
 
     @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
+
+    @Override
     public Integer getFormRetrieve() {
         return formRetrieve;
     }

+ 36 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsPatent.java

@@ -66,6 +66,12 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
 
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
+
 
     private Integer  setUpStatus;
     private String setUpTime;
@@ -80,6 +86,36 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private Integer	certificatesCount;
 
     @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
+
+    @Override
     public Integer getFormRetrieve() {
         return formRetrieve;
     }

+ 36 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsSoftwareWorks.java

@@ -64,6 +64,12 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     @Excel(name = "满意度",readConverterExp = "0=非常满意,1=满意,2=一般,3=不满意")
     private Integer satisfactionDegree;
 
+    @Excel(name = "特批",readConverterExp = "0=非特批,1=特批待审核,2=特批通过,3=特批驳回,4=董事长特批待审核,5=董事长特批通过,6董事长特批驳回")
+    private Integer approval;
+    @Excel(name="特批类型")
+    private String type;
+    private String typeExplain;
+
     private Integer  setUpStatus;
     private String setUpTime;
     private Integer  spotCheckStatus;
@@ -78,6 +84,36 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private Integer	certificatesCount;
 
     @Override
+    public Integer getApproval() {
+        return approval;
+    }
+
+    @Override
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String getTypeExplain() {
+        return typeExplain;
+    }
+
+    @Override
+    public void setTypeExplain(String typeExplain) {
+        this.typeExplain = typeExplain;
+    }
+
+    @Override
     public Integer getFormRetrieve() {
         return formRetrieve;
     }

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

@@ -120,11 +120,11 @@ public class OrderProjectApiController extends CertifyApiController {
 	public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
 			String endTime,String type,Integer pageNo,Integer pageSize){
-		@SuppressWarnings("unchecked")
+
 		List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
 				cid, projectType,thchId,depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime ,type, pageNo, pageSize).getList();
 		for (managerListBo e : list) {
-			if (e!=null&&e.getType()!=null){
+			if (StringUtils.isNotEmpty(e.getType())){
 				String[] split = e.getType().split(",");
 				StringBuilder stringBuilder = new StringBuilder();
 				Arrays.stream(split).forEach(

+ 12 - 0
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -15,6 +15,7 @@ import com.goafanti.order.bo.InputProvincialStatistics;
 import com.goafanti.order.bo.OutProjectStatistics;
 import com.goafanti.order.bo.OutProvincialStatistics;
 import com.goafanti.order.bo.outStatistics.*;
+import com.goafanti.order.enums.ApprovalTypeEnums;
 import com.goafanti.order.service.ProjectStatisticsService;
 import groovy.util.logging.Log4j;
 import org.apache.commons.collections4.map.HashedMap;
@@ -107,6 +108,17 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			if(ib.getStatus()==null)ib.setStatus(0);
 			@SuppressWarnings("unchecked")
 			List<OutProjectStatistics> list=  (List<OutProjectStatistics>) selectTaskList(ib).getList();
+		for (OutProjectStatistics e : list) {
+			if (com.goafanti.common.utils.StringUtils.isNotEmpty(e.getType())){
+				String[] split = e.getType().split(",");
+				StringBuffer sb=new StringBuffer();
+				for (String s : split) {
+					String desc = ApprovalTypeEnums.getDesc(s);
+					sb.append(desc).append(",");
+				}
+				e.setType(sb.substring(0,sb.length()-1));
+			}
+		}
 			Result res =new Result();
 			if (ib.getStatus()==null||ib.getStatus()==0){
 				List<OutProjectStatisticsCommon> tl=new ArrayList<>();