From 4305bc5300de94adb554f13e8bc8d60ce0fc9e93 Mon Sep 17 00:00:00 2001
From: "1756987863@qq.com" <1756987863@qq.com>
Date: Thu, 12 Aug 2021 18:03:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=89=8D=E6=9C=9F=E8=BD=AC=E5=90=88?=
=?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 10 +
.../WebApiBootStartupApplication.java | 7 +-
.../api/stage/controller/StageController.java | 31 ++
.../web/api/stage/mapper/StageMapper.java | 15 +
.../web/api/stage/service/StageService.java | 6 +
.../stage/service/impl/StageServiceImpl.java | 23 ++
.../web/api/stage/vo/ContactVo.java | 278 ++++++++++++++++++
7 files changed, 369 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java
create mode 100644 src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
create mode 100644 src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java
create mode 100644 src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
create mode 100644 src/main/java/com/authine/cloudpivot/web/api/stage/vo/ContactVo.java
diff --git a/pom.xml b/pom.xml
index 27f0bca..d460405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,16 @@
spring-boot-starter-test
test
+
+ tk.mybatis
+ mapper-spring-boot-starter
+ 2.0.4
+
+
+ tk.mybatis
+ mapper-generator
+ 1.1.5
+
diff --git a/src/main/java/com/authine/cloudpivot/WebApiBootStartupApplication.java b/src/main/java/com/authine/cloudpivot/WebApiBootStartupApplication.java
index d480742..2ff50d5 100644
--- a/src/main/java/com/authine/cloudpivot/WebApiBootStartupApplication.java
+++ b/src/main/java/com/authine/cloudpivot/WebApiBootStartupApplication.java
@@ -1,6 +1,7 @@
package com.authine.cloudpivot;
import lombok.extern.slf4j.Slf4j;
+import org.mapstruct.Mapper;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -9,11 +10,15 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import tk.mybatis.spring.annotation.MapperScan;
import java.net.InetAddress;
import java.net.UnknownHostException;
-@SpringBootApplication
+@SpringBootApplication(
+ scanBasePackages = {"com.authine.cloudpivot.web.api", "com.authine.cloudpivot.sso", "com.authine.cloudpivot"}
+)
+@MapperScan(basePackages = "com.authine.cloudpivot.web.api.stage.mapper")
@EnableSwagger2
@Slf4j
@EnableRedisHttpSession(redisNamespace = "${spring.session.redis.namespace}")
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java b/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java
new file mode 100644
index 0000000..b6fb1e8
--- /dev/null
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java
@@ -0,0 +1,31 @@
+package com.authine.cloudpivot.web.api.stage.controller;
+
+import com.authine.cloudpivot.web.api.controller.base.BaseController;
+import com.authine.cloudpivot.web.api.dubbo.DubboConfigService;
+import com.authine.cloudpivot.web.api.stage.service.StageService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RequestMapping("/api/contact")
+@RestController
+@Component
+public class StageController extends BaseController {
+
+
+ @Autowired
+ DubboConfigService dubboConfigService;
+
+ @Autowired
+ private StageService skipService;
+
+ @GetMapping("/getIndexNewsList")
+ public String getSkipDataList(){
+ String marktostage =dubboConfigService.getBizObjectFacade().getTableName("marktostage");
+ return skipService.getSkipDataList(marktostage);
+ }
+}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java b/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
new file mode 100644
index 0000000..ada85f6
--- /dev/null
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
@@ -0,0 +1,15 @@
+package com.authine.cloudpivot.web.api.stage.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface StageMapper {
+
+
+ @Select("SELECT * from biz_workflow_instance i \n" +
+ "left join \n" +
+ "#{marktostage} q on i.id=q.workflowInstanceId where i.state='COMPLETED'\n")
+ String getSkipDataList(@Param("marktostage") String marktostage);
+}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java b/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java
new file mode 100644
index 0000000..9ff0003
--- /dev/null
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java
@@ -0,0 +1,6 @@
+package com.authine.cloudpivot.web.api.stage.service;
+
+public interface StageService {
+
+ String getSkipDataList(String marktostage);
+}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java b/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
new file mode 100644
index 0000000..e91720c
--- /dev/null
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
@@ -0,0 +1,23 @@
+package com.authine.cloudpivot.web.api.stage.service.impl;
+
+
+import com.authine.cloudpivot.web.api.stage.mapper.StageMapper;
+import com.authine.cloudpivot.web.api.stage.service.StageService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class StageServiceImpl implements StageService {
+
+
+ @Autowired
+ StageMapper stageMapper;
+ @Override
+ public String getSkipDataList(String marktostage) {
+
+
+ return stageMapper.getSkipDataList(marktostage);
+ }
+}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/vo/ContactVo.java b/src/main/java/com/authine/cloudpivot/web/api/stage/vo/ContactVo.java
new file mode 100644
index 0000000..23ebfb7
--- /dev/null
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/vo/ContactVo.java
@@ -0,0 +1,278 @@
+package com.authine.cloudpivot.web.api.stage.vo;
+
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class ContactVo {
+ private String id;
+ /**
+ * 数据标题
+ */
+ private String name;
+ /**
+ * 创建人
+ */
+ private String creater;
+ /**
+ * 创建人部门
+ */
+ private String createdDeptid;
+ /**
+ * 拥有者
+ */
+ private String owner;
+ /**
+ * 拥有者部门
+ */
+ private String ownerDeptid;
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+ /**
+ * 修改人
+ */
+ private String modifier;
+ /**
+ * 修改时间
+ */
+ private Date modifiedTime;
+ /**
+ * 流程实例ID
+ */
+ private String workflowInstanceId;
+ /**
+ * 单据号
+ */
+ private String sequenceNo;
+ /**
+ * 单据状态
+ */
+ private String sequenceStatus;
+ /**
+ * 部门查询编码
+ */
+ private String ownerDeptQueryCode;
+ /**
+ * 合同编号
+ */
+ private String htCode;
+ /**
+ * 合同签订状态
+ */
+ private String htqdType;
+ /**
+ * 项目名称
+ */
+ private String proName;
+ /**
+ * 合同覆行状态
+ */
+ private String htfxType;
+ /**
+ * 签订日期
+ */
+ private Date qdDate;
+ /**
+ * 签约合同金额（万元）
+ */
+ private Double qyhtjeY;
+ /**
+ * 现合同金额（万元）
+ */
+ private Double htjeNow;
+ /**
+ * 已收入确认金额（万元
+ */
+ private Double incomeJe;
+ /**
+ * 已开发票金额（万元）
+ */
+ private Double invoiceJe;
+ /**
+ * 已收款金额（万元）
+ */
+ private Double collecJe;
+ /**
+ * 建设单位
+ */
+ private String jsdw;
+ /**
+ * 合同乙方
+ */
+ private String contractYf;
+ /**
+ * 项目客户联系人
+ */
+ private String linkman;
+ /**
+ * 手机号码
+ */
+ private Double phoneNumber;
+ /**
+ * 合同相关方
+ */
+ private String htxgf;
+ /**
+ * 经营责任主体一级部门
+ */
+ private Object yjDep;
+ /**
+ * 经营责任主体二级部门
+ */
+ private Object secondDep;
+ /**
+ * 实施负责主体部门
+ */
+ private Object ssDep;
+ /**
+ * 实施负责主体二级部门
+ */
+ private Object ssSecondDep;
+ /**
+ * 地址
+ */
+ private Object address;
+ /**
+ * 项目性质
+ */
+ private String xmxz;
+ /**
+ * 项目类型
+ */
+ private String xmType;
+ /**
+ * 是否集团统筹经营项目
+ */
+ private String jttcPro;
+ /**
+ * 是否集团重点关注项目
+ */
+ private String importXm;
+ /**
+ * 是否招投标项目
+ */
+ private String zbxm;
+ /**
+ * 是否虚拟合同
+ */
+ private String xnht;
+ /**
+ * 合同登记日期
+ */
+ private Date tjdjDateTime;
+ /**
+ * 已盖章送出日期
+ */
+ private Date scDate;
+ /**
+ * 签订确认日期
+ */
+ private Date qrDateTime;
+ /**
+ * 备注
+ */
+ private Object bzcontent;
+ /**
+ * 规模和特征
+ */
+ private String addGmOrTz;
+ /**
+ * 总投资或投资估算
+ */
+ private String ztzOrgs;
+ /**
+ * 工程费用
+ */
+ private String gcfy;
+ /**
+ * 备注
+ */
+ private Object tdContent;
+ /**
+ * 总建筑面积
+ */
+ private String zjzmj;
+ /**
+ * 其中地上建筑面积
+ */
+ private String dsjzmj;
+ /**
+ * 其中地下建筑面积
+ */
+ private String dxArea;
+ /**
+ * 用地面积
+ */
+ private String siteArea;
+ /**
+ * 常级
+ */
+ private String chJi;
+ /**
+ * 核级
+ */
+ private String heJi;
+ /**
+ * 地上层数
+ */
+ private String dsplies;
+ /**
+ * 地下室层数
+ */
+ private String dxplies;
+ /**
+ * 建筑高度
+ */
+ private String jzHeight;
+ /**
+ * 计费方式
+ */
+ private String billingFs;
+ /**
+ * 折扣率
+ */
+ private String discount;
+ /**
+ * 合计总价
+ */
+ private String zNum ;
+ /**
+ * 是否需要覆约担保
+ */
+ private String fydb;
+ /**
+ * 覆约担保比例（%）
+ */
+ private String fydbxs;
+ /**
+ * 覆约担保形式
+ */
+ private String dbxsfy;
+ /**
+ * 担保起始日期
+ */
+ private Date dbstartTime;
+ /**
+ * 担保结束日期
+ */
+ private Date dbendTime;
+ /**
+ * 担保提供日期
+ */
+ private Date tgTime;
+ /**
+ * 担保回收日期
+ */
+ private Date hsDate;
+ /**
+ * 担保回收金额（万元）
+ */
+ private Double dbhsje;
+
+}
--
Gitee
From b036bc5407b97eeca6d85570bc0d93ba974ee573 Mon Sep 17 00:00:00 2001
From: "1756987863@qq.com" <1756987863@qq.com>
Date: Thu, 12 Aug 2021 20:18:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E9=80=89=20befo?=
=?UTF-8?q?reObjectId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/stage/controller/StageController.java | 10 +++--
.../web/api/stage/mapper/StageMapper.java | 34 ++++++++++++--
.../web/api/stage/service/StageService.java | 3 +-
.../stage/service/impl/StageServiceImpl.java | 45 +++++++++++++++++--
4 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java b/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java
index b6fb1e8..f62fb0a 100644
--- a/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/controller/StageController.java
@@ -3,11 +3,13 @@ package com.authine.cloudpivot.web.api.stage.controller;
import com.authine.cloudpivot.web.api.controller.base.BaseController;
import com.authine.cloudpivot.web.api.dubbo.DubboConfigService;
import com.authine.cloudpivot.web.api.stage.service.StageService;
+import com.authine.cloudpivot.web.api.util.BaseJSON;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@@ -24,8 +26,10 @@ public class StageController extends BaseController {
private StageService skipService;
@GetMapping("/getIndexNewsList")
- public String getSkipDataList(){
- String marktostage =dubboConfigService.getBizObjectFacade().getTableName("marktostage");
- return skipService.getSkipDataList(marktostage);
+ public Boolean getSkipDataList(@RequestParam String beforeObjectId,@RequestParam String identification){
+ // String marktostage =dubboConfigService.getBizObjectFacade().getTableName("marktostage");
+ return skipService.getSkipDataList(beforeObjectId,identification);
}
+
+
}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java b/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
index ada85f6..e52cdec 100644
--- a/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
@@ -4,12 +4,40 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
@Mapper
public interface StageMapper {
- @Select("SELECT * from biz_workflow_instance i \n" +
+ @Select("SELECT i.id from biz_workflow_instance i \n" +
+ "left join \n" +
+ "i34ir_qqxxregister q on \n" +
+ "i.bizObjectId=q.id where q.beforeObjectId=#{beforeObjectId} and i.state in('COMPLETED','PROCESSING')\n")
+ List getSkipDataList(
+ @Param("beforeObjectId") String beforeObjectId
+ );
+
+ @Select("SELECT i.id from biz_workflow_instance i \n" +
+ "left join \n" +
+ "i34ir_marktostage q on \n" +
+ "i.bizObjectId=q.id where q.beforeObjectId=#{beforeObjectId} and i.state in('COMPLETED','PROCESSING')\n")
+ List getSkipDataList2(
+ @Param("beforeObjectId") String beforeObjectId
+ );
+
+ @Select("SELECT i.id from biz_workflow_instance i \n" +
+ "left join \n" +
+ "i34ir_qqztbxx q on \n" +
+ "i.bizObjectId=q.id where q.beforeObjectId=#{beforeObjectId} and i.state in('COMPLETED','PROCESSING')\n")
+ List getSkipDataList3(
+ @Param("beforeObjectId") String beforeObjectId
+ );
+ @Select("SELECT i.id from biz_workflow_instance i \n" +
"left join \n" +
- "#{marktostage} q on i.id=q.workflowInstanceId where i.state='COMPLETED'\n")
- String getSkipDataList(@Param("marktostage") String marktostage);
+ "i34ir_bjspsqlc q on \n" +
+ "i.bizObjectId=q.id where q.beforeObjectId=#{beforeObjectId} and i.state in('COMPLETED','PROCESSING')\n")
+ List getSkipDataList4(
+ @Param("beforeObjectId") String beforeObjectId
+ );
}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java b/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java
index 9ff0003..bd8fbdf 100644
--- a/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/service/StageService.java
@@ -2,5 +2,6 @@ package com.authine.cloudpivot.web.api.stage.service;
public interface StageService {
- String getSkipDataList(String marktostage);
+ Boolean getSkipDataList(String beforeObjectId,String identification);
+
}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java b/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
index e91720c..0cf368d 100644
--- a/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
@@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Slf4j
@Service
public class StageServiceImpl implements StageService {
@@ -15,9 +17,46 @@ public class StageServiceImpl implements StageService {
@Autowired
StageMapper stageMapper;
@Override
- public String getSkipDataList(String marktostage) {
-
+ public Boolean getSkipDataList(String beforeObjectId,String identification) {
- return stageMapper.getSkipDataList(marktostage);
+ Boolean hasList=true;
+ /**
+ * 前期信息登记
+ */
+ if(identification.equals("0")) {
+ List skipDataList = stageMapper.getSkipDataList(beforeObjectId);
+ if (skipDataList.size() > 0) {
+ hasList = false;
+ }
+ }
+ /**
+ * 营销转前期
+ */
+ if(identification.equals("1")) {
+ List skipDataList2 = stageMapper.getSkipDataList2(beforeObjectId);
+ if (skipDataList2.size() > 0) {
+ hasList = false;
+ }
+ }
+ /**
+ * 前期转投标
+ */
+ if(identification.equals("2")) {
+ List skipDataList3 = stageMapper.getSkipDataList3(beforeObjectId);
+ if (skipDataList3.size() > 0) {
+ hasList = false;
+ }
+ }
+ /**
+ * 报价审批
+ */
+ if(identification.equals("3")) {
+ List skipDataList4 = stageMapper.getSkipDataList4(beforeObjectId);
+ if (skipDataList4.size() > 0) {
+ hasList = false;
+ }
+ }
+ return hasList;
}
+
}
--
Gitee
From 48d29e99e69732041ebedecf81465c1a91c90872 Mon Sep 17 00:00:00 2001
From: "1756987863@qq.com" <1756987863@qq.com>
Date: Mon, 16 Aug 2021 09:39:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E6=9C=9F=E8=BD=AC=E5=90=88?=
=?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cloudpivot/web/api/stage/mapper/StageMapper.java | 8 ++++++++
.../web/api/stage/service/impl/StageServiceImpl.java | 10 ++++++++++
2 files changed, 18 insertions(+)
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java b/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
index e52cdec..2e3e3ef 100644
--- a/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/mapper/StageMapper.java
@@ -40,4 +40,12 @@ public interface StageMapper {
List getSkipDataList4(
@Param("beforeObjectId") String beforeObjectId
);
+
+ @Select("SELECT i.id from biz_workflow_instance i \n" +
+ "left join \n" +
+ "i34ir_qqpactapply q on \n" +
+ "i.bizObjectId=q.id where q.beforeObjectId=#{beforeObjectId} and i.state in('COMPLETED','PROCESSING')\n")
+ List getSkipDataList5(
+ @Param("beforeObjectId") String beforeObjectId
+ );
}
diff --git a/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java b/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
index 0cf368d..3f99cc2 100644
--- a/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
+++ b/src/main/java/com/authine/cloudpivot/web/api/stage/service/impl/StageServiceImpl.java
@@ -56,6 +56,16 @@ public class StageServiceImpl implements StageService {
hasList = false;
}
}
+
+ /**
+ * 转合同申请
+ */
+ if(identification.equals("4")) {
+ List skipDataList5 = stageMapper.getSkipDataList5(beforeObjectId);
+ if (skipDataList5.size() > 0) {
+ hasList = false;
+ }
+ }
return hasList;
}
--
Gitee