Browse Source

订单新增高新纯咨询信息

anderx 3 years ago
parent
commit
54870abf37

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

@@ -1428,12 +1428,14 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
       g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,
       h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile,
-      a.service_content serviceContent,a.examine_name examineName
+      a.service_content serviceContent,a.examine_name examineName, tht.knowledge_services knowledgeServices, tht.audit_services auditServices,
+      tht.add_deduction_services addDeductionServices, tht.knowledge_other knowledgeOther, tht.audit_other auditOther, tht.add_deduction_other addDeductionOther
     from t_order_new a left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.id
          left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id
          left join admin d on a.finance_id=d.id left join admin h on dep.finance_id=h.id
          left join  t_order_back  e on a.order_no=e.order_no and e.back_status=0
          left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
+        left join t_order_high_tech tht on a.order_no=tht.order_no
     where   a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
 

+ 83 - 4
src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java

@@ -9,6 +9,85 @@ public class TOrderNewWithBLOBs extends TOrderNew {
 	private BigDecimal paymentRatio;
 	private BigDecimal serviceAmount;
 	private String serviceRemarks;
+
+	/**
+	 * 知识产权服务 1已签 2企业已经拥有可申报高新的知识产权 3企业自行申报/已有其他合作的代理机构申报 0其他
+	 */
+	private Integer knowledgeServices;
+
+	/**
+	 * 审计服务 1已签 2企业已经有符合申报的年审/专审 3 业自行找会计事务所出具报告 0其他
+	 */
+	private Integer auditServices;
+
+	/**
+	 * 加计扣除服务 1已签 2企业不符合加计扣除范围 3企业自己已经做了加计扣除 4企业自行找其他机构做了加计扣除 0其他
+	 */
+	private Integer addDeductionServices;
+
+	/**
+	 * 知识产权服务其他描述
+	 */
+	private String knowledgeOther;
+
+	/**
+	 * 审计服务其他描述
+	 */
+	private String auditOther;
+
+	/**
+	 * 加计扣除服务其他描述
+	 */
+	private String addDeductionOther;
+
+	public Integer getKnowledgeServices() {
+		return knowledgeServices;
+	}
+
+	public void setKnowledgeServices(Integer knowledgeServices) {
+		this.knowledgeServices = knowledgeServices;
+	}
+
+	public Integer getAuditServices() {
+		return auditServices;
+	}
+
+	public void setAuditServices(Integer auditServices) {
+		this.auditServices = auditServices;
+	}
+
+	public Integer getAddDeductionServices() {
+		return addDeductionServices;
+	}
+
+	public void setAddDeductionServices(Integer addDeductionServices) {
+		this.addDeductionServices = addDeductionServices;
+	}
+
+	public String getKnowledgeOther() {
+		return knowledgeOther;
+	}
+
+	public void setKnowledgeOther(String knowledgeOther) {
+		this.knowledgeOther = knowledgeOther;
+	}
+
+	public String getAuditOther() {
+		return auditOther;
+	}
+
+	public void setAuditOther(String auditOther) {
+		this.auditOther = auditOther;
+	}
+
+	public String getAddDeductionOther() {
+		return addDeductionOther;
+	}
+
+	public void setAddDeductionOther(String addDeductionOther) {
+		this.addDeductionOther = addDeductionOther;
+	}
+
 	public Integer getServiceStatus() {
 		return serviceStatus;
 	}
@@ -45,7 +124,7 @@ public class TOrderNewWithBLOBs extends TOrderNew {
 	public void setServiceRemarks(String serviceRemarks) {
 		this.serviceRemarks = serviceRemarks;
 	}
-	
-	
-	
-}
+
+
+
+}

+ 78 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -57,6 +57,84 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer ischange;
 	private Integer stopProject;
 
+	/**
+	 * 知识产权服务 1已签 2企业已经拥有可申报高新的知识产权 3企业自行申报/已有其他合作的代理机构申报 0其他
+	 */
+	private Integer knowledgeServices;
+
+	/**
+	 * 审计服务 1已签 2企业已经有符合申报的年审/专审 3 业自行找会计事务所出具报告 0其他
+	 */
+	private Integer auditServices;
+
+	/**
+	 * 加计扣除服务 1已签 2企业不符合加计扣除范围 3企业自己已经做了加计扣除 4企业自行找其他机构做了加计扣除 0其他
+	 */
+	private Integer addDeductionServices;
+
+	/**
+	 * 知识产权服务其他描述
+	 */
+	private String knowledgeOther;
+
+	/**
+	 * 审计服务其他描述
+	 */
+	private String auditOther;
+
+	/**
+	 * 加计扣除服务其他描述
+	 */
+	private String addDeductionOther;
+
+
+	public Integer getKnowledgeServices() {
+		return knowledgeServices;
+	}
+
+	public void setKnowledgeServices(Integer knowledgeServices) {
+		this.knowledgeServices = knowledgeServices;
+	}
+
+	public Integer getAuditServices() {
+		return auditServices;
+	}
+
+	public void setAuditServices(Integer auditServices) {
+		this.auditServices = auditServices;
+	}
+
+	public Integer getAddDeductionServices() {
+		return addDeductionServices;
+	}
+
+	public void setAddDeductionServices(Integer addDeductionServices) {
+		this.addDeductionServices = addDeductionServices;
+	}
+
+	public String getKnowledgeOther() {
+		return knowledgeOther;
+	}
+
+	public void setKnowledgeOther(String knowledgeOther) {
+		this.knowledgeOther = knowledgeOther;
+	}
+
+	public String getAuditOther() {
+		return auditOther;
+	}
+
+	public void setAuditOther(String auditOther) {
+		this.auditOther = auditOther;
+	}
+
+	public String getAddDeductionOther() {
+		return addDeductionOther;
+	}
+
+	public void setAddDeductionOther(String addDeductionOther) {
+		this.addDeductionOther = addDeductionOther;
+	}
 
 	public Integer getStopProject() {
 		return stopProject;

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

@@ -137,6 +137,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private DepartmentService departmentService;
 	@Autowired
 	private TOrderPaymentMapper tOrderPaymentMapper;
+	@Autowired
+	private TOrderHighTechMapper tOrderHighTechMapper;
+
 	@Value(value = "${upload.path}")
 	private String					uploadPath			= null;
 
@@ -448,6 +451,20 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(a.getDepartmentId());
 		}
+		if (t.getKnowledgeServices()!=null||t.getAuditServices()!=null||t.getAddDeductionServices()!=null){
+			TOrderHighTech tighTech=new TOrderHighTech();
+			tighTech.setOrderNo(t.getOrderNo());
+			tighTech.setKnowledgeServices(t.getKnowledgeServices());
+			tighTech.setAuditServices(t.getAuditServices());
+			tighTech.setAddDeductionServices(t.getAddDeductionServices());
+			tighTech.setKnowledgeOther(t.getKnowledgeOther());
+			tighTech.setAuditOther(t.getAuditOther());
+			tighTech.setAddDeductionOther(t.getAddDeductionOther());
+			int i=tOrderHighTechMapper.updateByPrimaryKey(tighTech);
+			if(i==0){
+				tOrderHighTechMapper.insertSelective(tighTech);
+			}
+		}
 		//订单提交
 		if (isSubmit==1) {
 			t2.setApproval(t.getApproval());