瀏覽代碼

审批报送接口开发及Flawy脚本提交

wangzw 4 年之前
父節點
當前提交
3092ed52fc
共有 21 個文件被更改,包括 1759 次插入8 次删除
  1. 1 1
      approve-api/pom.xml
  2. 27 0
      approve-api/src/main/java/com/dragonsoft/dcuc/approve/facade/IApproveUploadFacade.java
  3. 207 0
      approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApproveCirculationDTO.java
  4. 380 0
      approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApproveRecordDTO.java
  5. 3 3
      approve-core-service/pom.xml
  6. 26 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveUploadFacade.java
  7. 14 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApproveCirculationMapper.java
  8. 14 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApproveQueryRelationMapper.java
  9. 10 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApproveRecordMapper.java
  10. 292 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveCirculationInfo.java
  11. 161 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveQueryRelation.java
  12. 157 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveRecordInfo.java
  13. 16 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/IApproveUploadService.java
  14. 96 0
      approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveUploadService.java
  15. 8 3
      approve-core-service/src/main/resources/application.yml
  16. 120 0
      approve-core-service/src/main/resources/config/mysql/V1_1_0003__INITIAL.sql
  17. 213 0
      approve-core-service/src/main/resources/config/oracle/V1_1_0003__INITIAL.sql
  18. 5 0
      approve-core-service/src/main/resources/mapping/ApproveCirculationMapper.xml
  19. 4 0
      approve-core-service/src/main/resources/mapping/ApproveQueryRelationMapper.xml
  20. 4 0
      approve-core-service/src/main/resources/mapping/ApproveRecordMapper.xml
  21. 1 1
      pom.xml

+ 1 - 1
approve-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>approve-core</artifactId>
         <groupId>com.dragoninfo.dcuc</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 27 - 0
approve-api/src/main/java/com/dragonsoft/dcuc/approve/facade/IApproveUploadFacade.java

@@ -0,0 +1,27 @@
+package com.dragonsoft.dcuc.approve.facade;
+
+
+import com.dragonsoft.dcuc.approve.model.req.ApproveRecordDTO;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @Author: wangzw
+ * @Date:   2021-5-6
+ * @Description:
+ */
+@Api(description = "审批信息报送服务")
+@FeignClient(name = "approve")
+public interface IApproveUploadFacade {
+
+    @ApiOperation(value = "审批信息报送", notes = "审批信息报送")
+    @RequestMapping(value = "api/v1/approve-upload", method = RequestMethod.POST)
+    ResponseStatus approveUpload(@RequestBody List<ApproveRecordDTO> approveRecordList);
+}

+ 207 - 0
approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApproveCirculationDTO.java

@@ -0,0 +1,207 @@
+package com.dragonsoft.dcuc.approve.model.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author wangzw
+ * @date 2021/5/26
+ * @desc
+ */
+@ApiModel(description = "审批流转记录")
+public class ApproveCirculationDTO {
+
+    /**
+     * 审批单编号
+     */
+    @ApiModelProperty(value = "审批单编号")
+    @NotBlank
+    private String approveNo;
+
+    /**
+     * 流程编号
+     */
+    @ApiModelProperty(value = "流程编号")
+    private String processNo;
+
+    /**
+     * 节点名称
+     */
+    @ApiModelProperty(value = "节点名称")
+    @NotBlank
+    private String nodeName;
+
+    /**
+     * 节点编号
+     */
+    @ApiModelProperty(value = "节点编号")
+    @NotBlank
+    private String nodeNo;
+
+    /**
+     * 操作类型,详见dm_operate_type码表
+     */
+    @ApiModelProperty(value = "操作类型,详见dm_operate_type码表")
+    @NotBlank
+    private String operateType;
+
+    /**
+     * 操作时间
+     */
+    @ApiModelProperty(value = "操作时间")
+    @NotBlank
+    private String operateTime;
+
+    /**
+     * 操作人姓名
+     */
+    @ApiModelProperty(value = "操作人姓名")
+    @NotBlank
+    private String operateUserName;
+
+    /**
+     * 操作人身份证号码
+     */
+    @ApiModelProperty(value = "操作人身份证号码")
+    @NotBlank
+    private String operateUserId;
+
+    /**
+     * 操作人单位名称
+     */
+    @ApiModelProperty(value = "操作人单位名称")
+    @NotBlank
+    private String operateUserOrg;
+
+    /**
+     * 操作人单位编号
+     */
+    @ApiModelProperty(value = "操作人单位编号")
+    @NotBlank
+    private String operateUserOrgId;
+
+    /**
+     * 审批意见
+     */
+    @ApiModelProperty(value = "审批意见")
+    @NotBlank
+    private String approveOpinion;
+
+    /**
+     * 操作耗时
+     */
+    @ApiModelProperty(value = "操作耗时")
+    private String operateTimeConsuming;
+
+    /**
+     * 电子签名
+     */
+    @ApiModelProperty(value = "电子签名")
+    private String electronicSignature;
+
+    public String getApproveNo() {
+        return approveNo;
+    }
+
+    public void setApproveNo(String approveNo) {
+        this.approveNo = approveNo;
+    }
+
+    public String getProcessNo() {
+        return processNo;
+    }
+
+    public void setProcessNo(String processNo) {
+        this.processNo = processNo;
+    }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
+
+    public String getNodeNo() {
+        return nodeNo;
+    }
+
+    public void setNodeNo(String nodeNo) {
+        this.nodeNo = nodeNo;
+    }
+
+    public String getOperateType() {
+        return operateType;
+    }
+
+    public void setOperateType(String operateType) {
+        this.operateType = operateType;
+    }
+
+    public String getOperateTime() {
+        return operateTime;
+    }
+
+    public void setOperateTime(String operateTime) {
+        this.operateTime = operateTime;
+    }
+
+    public String getOperateUserName() {
+        return operateUserName;
+    }
+
+    public void setOperateUserName(String operateUserName) {
+        this.operateUserName = operateUserName;
+    }
+
+    public String getOperateUserId() {
+        return operateUserId;
+    }
+
+    public void setOperateUserId(String operateUserId) {
+        this.operateUserId = operateUserId;
+    }
+
+    public String getOperateUserOrg() {
+        return operateUserOrg;
+    }
+
+    public void setOperateUserOrg(String operateUserOrg) {
+        this.operateUserOrg = operateUserOrg;
+    }
+
+    public String getOperateUserOrgId() {
+        return operateUserOrgId;
+    }
+
+    public void setOperateUserOrgId(String operateUserOrgId) {
+        this.operateUserOrgId = operateUserOrgId;
+    }
+
+    public String getApproveOpinion() {
+        return approveOpinion;
+    }
+
+    public void setApproveOpinion(String approveOpinion) {
+        this.approveOpinion = approveOpinion;
+    }
+
+    public String getOperateTimeConsuming() {
+        return operateTimeConsuming;
+    }
+
+    public void setOperateTimeConsuming(String operateTimeConsuming) {
+        this.operateTimeConsuming = operateTimeConsuming;
+    }
+
+    public String getElectronicSignature() {
+        return electronicSignature;
+    }
+
+    public void setElectronicSignature(String electronicSignature) {
+        this.electronicSignature = electronicSignature;
+    }
+}

+ 380 - 0
approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApproveRecordDTO.java

@@ -0,0 +1,380 @@
+package com.dragonsoft.dcuc.approve.model.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @author wangzw
+ * @date 2021/5/26
+ * @desc 审批单信息
+ */
+@ApiModel(description = "审批单信息")
+public class ApproveRecordDTO {
+
+    /**
+     * 流程编号
+     */
+    @ApiModelProperty(value = "流程编号")
+    private String processNo;
+
+    /**
+     * 流程名称
+     */
+    @ApiModelProperty(value = "流程名称")
+    private String processName;
+
+    /**
+     * 审批类型,详见dm_approve_type码表
+     */
+    @ApiModelProperty(value = "审批类型")
+    @NotBlank
+    private String approveType;
+
+    /**
+     * 审批单编号
+     */
+    @ApiModelProperty(value = "审批单编号")
+    @NotBlank
+    private String approveNo;
+
+    /**
+     * 审批单标题
+     */
+    @ApiModelProperty(value = "审批单标题")
+    @NotBlank
+    private String approveTitle;
+
+    /**
+     * 申请人身份证号码
+     */
+    @ApiModelProperty(value = "申请人身份证号码")
+    @NotBlank
+    private String applicantIdcard;
+
+    /**
+     * 申请人姓名
+     */
+    @ApiModelProperty(value = "申请人姓名")
+    @NotBlank
+    private String applicantName;
+
+    /**
+     * 申请人手机号码
+     */
+    @ApiModelProperty(value = "申请人手机号码")
+    @NotBlank
+    private String applicantPhoneNo;
+
+    /**
+     * 申请人单位代码
+     */
+    @ApiModelProperty(value = "申请人单位代码")
+    @NotBlank
+    private String applicantOrgCode;
+
+    /**
+     * 申请人单位名称
+     */
+    @ApiModelProperty(value = "申请人单位名称")
+    @NotBlank
+    private String applicantOrgName;
+
+    /**
+     * 申请时间
+     */
+    @ApiModelProperty(value = "申请时间")
+    @NotBlank
+    private String applyTime;
+
+    /**
+     * 应用名称
+     */
+    @ApiModelProperty(value = "应用名称")
+    @NotBlank
+    private String appName;
+
+    /**
+     * 应用编号
+     */
+    @ApiModelProperty(value = "应用编号")
+    @NotBlank
+    private String appCode;
+
+    /**
+     * 审批内容
+     */
+    @ApiModelProperty(value = "审批内容")
+    @NotBlank
+    private String approveContent;
+
+    /**
+     * 访问资源
+     */
+    @ApiModelProperty(value = "访问资源")
+    private String accessResources;
+
+    /**
+     * 访问资源编号
+     */
+    @ApiModelProperty(value = "访问资源编号")
+    private String accessResourcesNo;
+
+    /**
+     * 有效期
+     */
+    @ApiModelProperty(value = "有效期")
+    private String validPeriodTime;
+
+    /**
+     * 申请事由
+     */
+    @ApiModelProperty(value = "申请事由")
+    @NotBlank
+    private String applyCause;
+
+    /**
+     * 最终审批结果,详见dm_approval_result码表
+     */
+    @ApiModelProperty(value = "最终审批结果,详见dm_approval_result码表")
+    @NotBlank
+    private String finalApprovalResult;
+
+    /**
+     * 附件地址
+     */
+    @ApiModelProperty(value = "附件地址")
+    private String attachmentUrl;
+
+    /**
+     * 案件/事件/线索/被查询人员类别
+     */
+    @ApiModelProperty(value = "案件/事件/线索/被查询人员类别")
+    private String queryUserType;
+
+    /**
+     * 案件/事件/线索/被查询人员名称
+     */
+    @ApiModelProperty(value = "案件/事件/线索/被查询人员名称")
+    private String queryUserName;
+
+    /**
+     * 案件/事件/线索/被查询人员编号
+     */
+    @ApiModelProperty(value = "案件/事件/线索/被查询人员编号")
+    private String queryUserId;
+
+    /**
+     * 其他申请信息
+     */
+    @ApiModelProperty(value = "其他申请信息")
+    private String otherApplyContext;
+
+    /**
+     * 审批流转信息list
+     */
+    @ApiModelProperty(value = "审批流转信息list")
+    private List<ApproveCirculationDTO> approveCirculationList;
+
+    public String getProcessNo() {
+        return processNo;
+    }
+
+    public void setProcessNo(String processNo) {
+        this.processNo = processNo;
+    }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    public String getApproveType() {
+        return approveType;
+    }
+
+    public void setApproveType(String approveType) {
+        this.approveType = approveType;
+    }
+
+    public String getApproveNo() {
+        return approveNo;
+    }
+
+    public void setApproveNo(String approveNo) {
+        this.approveNo = approveNo;
+    }
+
+    public String getApproveTitle() {
+        return approveTitle;
+    }
+
+    public void setApproveTitle(String approveTitle) {
+        this.approveTitle = approveTitle;
+    }
+
+    public String getApplicantIdcard() {
+        return applicantIdcard;
+    }
+
+    public void setApplicantIdcard(String applicantIdcard) {
+        this.applicantIdcard = applicantIdcard;
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
+    public String getApplicantPhoneNo() {
+        return applicantPhoneNo;
+    }
+
+    public void setApplicantPhoneNo(String applicantPhoneNo) {
+        this.applicantPhoneNo = applicantPhoneNo;
+    }
+
+    public String getApplicantOrgCode() {
+        return applicantOrgCode;
+    }
+
+    public void setApplicantOrgCode(String applicantOrgCode) {
+        this.applicantOrgCode = applicantOrgCode;
+    }
+
+    public String getApplicantOrgName() {
+        return applicantOrgName;
+    }
+
+    public void setApplicantOrgName(String applicantOrgName) {
+        this.applicantOrgName = applicantOrgName;
+    }
+
+    public String getApplyTime() {
+        return applyTime;
+    }
+
+    public void setApplyTime(String applyTime) {
+        this.applyTime = applyTime;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public String getApproveContent() {
+        return approveContent;
+    }
+
+    public void setApproveContent(String approveContent) {
+        this.approveContent = approveContent;
+    }
+
+    public String getAccessResources() {
+        return accessResources;
+    }
+
+    public void setAccessResources(String accessResources) {
+        this.accessResources = accessResources;
+    }
+
+    public String getAccessResourcesNo() {
+        return accessResourcesNo;
+    }
+
+    public void setAccessResourcesNo(String accessResourcesNo) {
+        this.accessResourcesNo = accessResourcesNo;
+    }
+
+    public String getValidPeriodTime() {
+        return validPeriodTime;
+    }
+
+    public void setValidPeriodTime(String validPeriodTime) {
+        this.validPeriodTime = validPeriodTime;
+    }
+
+    public String getApplyCause() {
+        return applyCause;
+    }
+
+    public void setApplyCause(String applyCause) {
+        this.applyCause = applyCause;
+    }
+
+    public String getFinalApprovalResult() {
+        return finalApprovalResult;
+    }
+
+    public void setFinalApprovalResult(String finalApprovalResult) {
+        this.finalApprovalResult = finalApprovalResult;
+    }
+
+    public String getAttachmentUrl() {
+        return attachmentUrl;
+    }
+
+    public void setAttachmentUrl(String attachmentUrl) {
+        this.attachmentUrl = attachmentUrl;
+    }
+
+    public String getQueryUserType() {
+        return queryUserType;
+    }
+
+    public void setQueryUserType(String queryUserType) {
+        this.queryUserType = queryUserType;
+    }
+
+    public String getQueryUserName() {
+        return queryUserName;
+    }
+
+    public void setQueryUserName(String queryUserName) {
+        this.queryUserName = queryUserName;
+    }
+
+    public String getQueryUserId() {
+        return queryUserId;
+    }
+
+    public void setQueryUserId(String queryUserId) {
+        this.queryUserId = queryUserId;
+    }
+
+    public String getOtherApplyContext() {
+        return otherApplyContext;
+    }
+
+    public void setOtherApplyContext(String otherApplyContext) {
+        this.otherApplyContext = otherApplyContext;
+    }
+
+    public List<ApproveCirculationDTO> getApproveCirculationList() {
+        return approveCirculationList;
+    }
+
+    public void setApproveCirculationList(List<ApproveCirculationDTO> approveCirculationList) {
+        this.approveCirculationList = approveCirculationList;
+    }
+}

+ 3 - 3
approve-core-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>approve-core</artifactId>
         <groupId>com.dragoninfo.dcuc</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>approve-core-service</artifactId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.49</version>
+            <version>5.1.22</version>
         </dependency>
         <!--配置第三方组件结束-->
 
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>com.dragoninfo.dcuc</groupId>
             <artifactId>approve-api</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

+ 26 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveUploadFacade.java

@@ -0,0 +1,26 @@
+package com.dragonsoft.dcuc.approve.facade;
+
+import com.dragonsoft.dcuc.approve.model.req.ApproveRecordDTO;
+import com.dragonsoft.dcuc.approve.service.IApproveUploadService;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author wangzw
+ * @date 2021/5/26
+ * @desc
+ */
+@RestController
+public class ApproveUploadFacade implements IApproveUploadFacade {
+
+    @Autowired
+    private IApproveUploadService approveUploadService;
+
+    @Override
+    public ResponseStatus approveUpload(List<ApproveRecordDTO> approveRecordList) {
+        return approveUploadService.approveUpload(approveRecordList);
+    }
+}

+ 14 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApproveCirculationMapper.java

@@ -0,0 +1,14 @@
+package com.dragonsoft.dcuc.approve.mapper;
+
+import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
+import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author wangzw
+ * @date 2021/5/26
+ * @desc
+ */
+@Mapper
+public interface ApproveCirculationMapper extends BaseMybatisMapper<ApproveCirculationInfo> {
+}

+ 14 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApproveQueryRelationMapper.java

@@ -0,0 +1,14 @@
+package com.dragonsoft.dcuc.approve.mapper;
+
+import com.dragonsoft.dcuc.approve.model.ApproveQueryRelation;
+import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author wangzw
+ * @date 2021/5/26
+ * @desc
+ */
+@Mapper
+public interface ApproveQueryRelationMapper extends BaseMybatisMapper<ApproveQueryRelation> {
+}

+ 10 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/mapper/ApproveRecordMapper.java

@@ -0,0 +1,10 @@
+package com.dragonsoft.dcuc.approve.mapper;
+
+
+import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
+import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ApproveRecordMapper extends BaseMybatisMapper<ApproveRecordInfo> {
+}

+ 292 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveCirculationInfo.java

@@ -0,0 +1,292 @@
+package com.dragonsoft.dcuc.approve.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.sql.Timestamp;
+
+/**
+ * @Description  
+ * @Author  wangzw
+ * @Date 2021-05-26 
+ */
+
+@Data
+@TableName(value ="t_approve_circulation_info" )
+public class ApproveCirculationInfo extends IdEntity{
+
+	/**
+	 * 审批单信息记录id
+	 */
+	private String approveRecordId;
+
+	/**
+	 * 审批单编号
+	 */
+	private String approveNo;
+
+	/**
+	 * 流程编号
+	 */
+	private String processNo;
+
+	/**
+	 * 节点名称
+	 */
+	private String nodeName;
+
+	/**
+	 * 节点编号
+	 */
+	private String nodeNo;
+
+	/**
+	 * 操作类型,详见dm_operate_type码表
+	 */
+	private String operateType;
+
+	/**
+	 * 操作时间
+	 */
+	private String operateTime;
+
+	/**
+	 * 操作人姓名
+	 */
+	private String operateUserName;
+
+	/**
+	 * 操作人身份证号码
+	 */
+	private String operateUserId;
+
+	/**
+	 * 操作人单位名称
+	 */
+	private String operateUserOrg;
+
+	/**
+	 * 操作人单位编号
+	 */
+	private String operateUserOrgId;
+
+	/**
+	 * 审批意见
+	 */
+	private String approveOpinion;
+
+	/**
+	 * 操作耗时
+	 */
+	private String operateTimeConsuming;
+
+	/**
+	 * 电子签名
+	 */
+	private String electronicSignature;
+
+	/**
+	 * 是否删除
+	 */
+	private String isDeleted;
+
+	/**
+	 * 创建人
+	 */
+	private String createUser;
+
+	/**
+	 * 创建时间
+	 */
+	private Timestamp createTime;
+
+	/**
+	 * 更新人
+	 */
+	private String updateUser;
+
+	/**
+	 * 更新时间
+	 */
+	private Timestamp updateTime;
+
+	/**
+	 * 删除人
+	 */
+	private String deleteUser;
+
+	/**
+	 * 删除时间
+	 */
+	private Timestamp deleteTime;
+
+
+	public String getApproveRecordId() {
+		return this.approveRecordId;
+	}
+
+	public void setApproveRecordId(String approveRecordId) {
+		this.approveRecordId = approveRecordId;
+	}
+
+	public String getApproveNo() {
+		return this.approveNo;
+	}
+
+	public void setApproveNo(String approveNo) {
+		this.approveNo = approveNo;
+	}
+
+	public String getProcessNo() {
+		return this.processNo;
+	}
+
+	public void setProcessNo(String processNo) {
+		this.processNo = processNo;
+	}
+
+	public String getNodeName() {
+		return this.nodeName;
+	}
+
+	public void setNodeName(String nodeName) {
+		this.nodeName = nodeName;
+	}
+
+	public String getNodeNo() {
+		return this.nodeNo;
+	}
+
+	public void setNodeNo(String nodeNo) {
+		this.nodeNo = nodeNo;
+	}
+
+	public String getOperateType() {
+		return this.operateType;
+	}
+
+	public void setOperateType(String operateType) {
+		this.operateType = operateType;
+	}
+
+	public String getOperateTime() {
+		return this.operateTime;
+	}
+
+	public void setOperateTime(String operateTime) {
+		this.operateTime = operateTime;
+	}
+
+	public String getOperateUserName() {
+		return this.operateUserName;
+	}
+
+	public void setOperateUserName(String operateUserName) {
+		this.operateUserName = operateUserName;
+	}
+
+	public String getOperateUserId() {
+		return this.operateUserId;
+	}
+
+	public void setOperateUserId(String operateUserId) {
+		this.operateUserId = operateUserId;
+	}
+
+	public String getOperateUserOrg() {
+		return this.operateUserOrg;
+	}
+
+	public void setOperateUserOrg(String operateUserOrg) {
+		this.operateUserOrg = operateUserOrg;
+	}
+
+	public String getOperateUserOrgId() {
+		return this.operateUserOrgId;
+	}
+
+	public void setOperateUserOrgId(String operateUserOrgId) {
+		this.operateUserOrgId = operateUserOrgId;
+	}
+
+	public String getApproveOpinion() {
+		return this.approveOpinion;
+	}
+
+	public void setApproveOpinion(String approveOpinion) {
+		this.approveOpinion = approveOpinion;
+	}
+
+	public String getOperateTimeConsuming() {
+		return this.operateTimeConsuming;
+	}
+
+	public void setOperateTimeConsuming(String operateTimeConsuming) {
+		this.operateTimeConsuming = operateTimeConsuming;
+	}
+
+	public String getElectronicSignature() {
+		return this.electronicSignature;
+	}
+
+	public void setElectronicSignature(String electronicSignature) {
+		this.electronicSignature = electronicSignature;
+	}
+
+	public String getIsDeleted() {
+		return this.isDeleted;
+	}
+
+	public void setIsDeleted(String isDeleted) {
+		this.isDeleted = isDeleted;
+	}
+
+	public String getCreateUser() {
+		return this.createUser;
+	}
+
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	public Timestamp getCreateTime() {
+		return this.createTime;
+	}
+
+	public void setCreateTime(Timestamp createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateUser() {
+		return this.updateUser;
+	}
+
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+
+	public Timestamp getUpdateTime() {
+		return this.updateTime;
+	}
+
+	public void setUpdateTime(Timestamp updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getDeleteUser() {
+		return this.deleteUser;
+	}
+
+	public void setDeleteUser(String deleteUser) {
+		this.deleteUser = deleteUser;
+	}
+
+	public Timestamp getDeleteTime() {
+		return this.deleteTime;
+	}
+
+	public void setDeleteTime(Timestamp deleteTime) {
+		this.deleteTime = deleteTime;
+	}
+
+}

+ 161 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveQueryRelation.java

@@ -0,0 +1,161 @@
+package com.dragonsoft.dcuc.approve.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.sql.Timestamp;
+
+/**
+ * @Description  
+ * @Author  wangzw
+ * @Date 2021-05-26 
+ */
+
+@Data
+@TableName(value = "t_approve_query_relation" )
+public class ApproveQueryRelation extends IdEntity{
+
+	/**
+	 * 审批单信息记录id
+	 */
+	private String approveRecordId;
+
+	/**
+	 * 案件/事件/线索/被查询人员类别
+	 */
+	private String queryUserType;
+
+	/**
+	 * 案件/事件/线索/被查询人员名称
+	 */
+	private String queryUserName;
+
+	/**
+	 * 案件/事件/线索/被查询人员编号
+	 */
+	private String queryUserId;
+
+	/**
+	 * 是否删除
+	 */
+	private String isDeleted;
+
+	/**
+	 * 创建人
+	 */
+	private String createUser;
+
+	/**
+	 * 创建时间
+	 */
+	private Timestamp createTime;
+
+	/**
+	 * 更新人
+	 */
+	private String updateUser;
+
+	/**
+	 * 更新时间
+	 */
+	private Timestamp updateTime;
+
+	/**
+	 * 删除人
+	 */
+	private String deleteUser;
+
+	/**
+	 * 删除时间
+	 */
+	private Timestamp deleteTime;
+
+	public String getApproveRecordId() {
+		return this.approveRecordId;
+	}
+
+	public void setApproveRecordId(String approveRecordId) {
+		this.approveRecordId = approveRecordId;
+	}
+
+	public String getQueryUserType() {
+		return this.queryUserType;
+	}
+
+	public void setQueryUserType(String queryUserType) {
+		this.queryUserType = queryUserType;
+	}
+
+	public String getQueryUserName() {
+		return this.queryUserName;
+	}
+
+	public void setQueryUserName(String queryUserName) {
+		this.queryUserName = queryUserName;
+	}
+
+	public String getQueryUserId() {
+		return this.queryUserId;
+	}
+
+	public void setQueryUserId(String queryUserId) {
+		this.queryUserId = queryUserId;
+	}
+
+	public String getIsDeleted() {
+		return this.isDeleted;
+	}
+
+	public void setIsDeleted(String isDeleted) {
+		this.isDeleted = isDeleted;
+	}
+
+	public String getCreateUser() {
+		return this.createUser;
+	}
+
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	public Timestamp getCreateTime() {
+		return this.createTime;
+	}
+
+	public void setCreateTime(Timestamp createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateUser() {
+		return this.updateUser;
+	}
+
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+
+	public Timestamp getUpdateTime() {
+		return this.updateTime;
+	}
+
+	public void setUpdateTime(Timestamp updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getDeleteUser() {
+		return this.deleteUser;
+	}
+
+	public void setDeleteUser(String deleteUser) {
+		this.deleteUser = deleteUser;
+	}
+
+	public Timestamp getDeleteTime() {
+		return this.deleteTime;
+	}
+
+	public void setDeleteTime(Timestamp deleteTime) {
+		this.deleteTime = deleteTime;
+	}
+
+}

+ 157 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/model/ApproveRecordInfo.java

@@ -0,0 +1,157 @@
+package com.dragonsoft.dcuc.approve.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * @Description 审批单信息实体
+ * @Author  	wangzw
+ * @Date   		2021-05-26
+ */
+@Data
+@TableName(value ="t_approve_record_info")
+public class ApproveRecordInfo extends IdEntity{
+
+	/**
+	 * 流程编号
+	 */
+	private String processNo;
+
+	/**
+	 * 流程名称
+	 */
+	private String processName;
+
+	/**
+	 * 审批类型,详见dm_approve_type码表
+	 */
+	private String approveType;
+
+	/**
+	 * 审批单编号
+	 */
+	private String approveNo;
+
+	/**
+	 * 审批单标题
+	 */
+	private String approveTitle;
+
+	/**
+	 * 申请人身份证号码
+	 */
+	private String applicantIdcard;
+
+	/**
+	 * 申请人姓名
+	 */
+	private String applicantName;
+
+	/**
+	 * 申请人手机号码
+	 */
+	private String applicantPhoneNo;
+
+	/**
+	 * 申请人单位代码
+	 */
+	private String applicantOrgCode;
+
+	/**
+	 * 申请人单位名称
+	 */
+	private String applicantOrgName;
+
+	/**
+	 * 申请时间
+	 */
+	private String applyTime;
+
+	/**
+	 * 应用名称
+	 */
+	private String appName;
+
+	/**
+	 * 应用编号
+	 */
+	private String appCode;
+
+	/**
+	 * 审批内容
+	 */
+	private String approveContent;
+
+	/**
+	 * 访问资源
+	 */
+	private String accessResources;
+
+	/**
+	 * 访问资源编号
+	 */
+	private String accessResourcesNo;
+
+	/**
+	 * 有效期
+	 */
+	private String validPeriodTime;
+
+	/**
+	 * 申请事由
+	 */
+	private String applyCause;
+
+	/**
+	 * 最终审批结果,详见dm_approval_result码表
+	 */
+	private String finalApprovalResult;
+
+	/**
+	 * 附件地址
+	 */
+	private String attachmentUrl;
+
+	/**
+	 * 其他申请信息
+	 */
+	private String otherApplyContext;
+
+	/**
+	 * 是否删除
+	 */
+	private String isDeleted;
+
+	/**
+	 * 创建人
+	 */
+	private String createUser;
+
+	/**
+	 * 创建时间
+	 */
+	private Timestamp createTime;
+
+	/**
+	 * 更新人
+	 */
+	private String updateUser;
+
+	/**
+	 * 更新时间
+	 */
+	private Timestamp updateTime;
+
+	/**
+	 * 删除人
+	 */
+	private String deleteUser;
+
+	/**
+	 * 删除时间
+	 */
+	private Timestamp deleteTime;
+
+}

+ 16 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/IApproveUploadService.java

@@ -0,0 +1,16 @@
+package com.dragonsoft.dcuc.approve.service;
+
+import com.dragonsoft.dcuc.approve.model.req.ApproveRecordDTO;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+
+import java.util.List;
+
+/**
+ * @author wangzw
+ * @date 2021/5/26
+ * @desc
+ */
+public interface IApproveUploadService {
+
+    ResponseStatus approveUpload(List<ApproveRecordDTO> approveRecordList);
+}

+ 96 - 0
approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveUploadService.java

@@ -0,0 +1,96 @@
+package com.dragonsoft.dcuc.approve.service.impl;
+
+import com.dragonsoft.approve.common.ErrorCode;
+import com.dragonsoft.dcuc.approve.enumresources.YesNoEnum;
+import com.dragonsoft.dcuc.approve.mapper.ApproveCirculationMapper;
+import com.dragonsoft.dcuc.approve.mapper.ApproveQueryRelationMapper;
+import com.dragonsoft.dcuc.approve.mapper.ApproveRecordMapper;
+import com.dragonsoft.dcuc.approve.model.ApproveCirculationInfo;
+import com.dragonsoft.dcuc.approve.model.ApproveQueryRelation;
+import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
+import com.dragonsoft.dcuc.approve.model.req.ApproveRecordDTO;
+import com.dragonsoft.dcuc.approve.service.IApproveUploadService;
+import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import com.dragonsoft.duceap.base.exception.ApplicationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * @author wangzw
+ * @date   2021/5/26
+ * @desc  审批信息保存
+ */
+@Service
+@Transactional
+@EnableAsync
+public class ApproveUploadService implements IApproveUploadService {
+
+    private static final Logger logger = LoggerFactory.getLogger(ApproveUploadService.class);
+
+    @Autowired(required = false)
+    private ApproveRecordMapper approveRecordMapper;
+
+    @Autowired(required = false)
+    private ApproveQueryRelationMapper approveQueryRelationMapper;
+
+    @Autowired(required = false)
+    private ApproveCirculationMapper approveCirculationMapper;
+
+    @Override
+    public ResponseStatus approveUpload(List<ApproveRecordDTO> approveRecordList) {
+        logger.info("审批单信息保存开始,数据推送条数:【{}】",approveRecordList.size());
+        try {
+            if (!ObjectUtils.isEmpty(approveRecordList)){
+                //审批单信息处理
+                approveRecordList.forEach(
+                    approveRecord -> {
+                        ApproveRecordInfo approveRecordInfo = new ApproveRecordInfo();
+                        BeanUtils.copyProperties(approveRecord,approveRecordInfo);
+                        approveRecordInfo.setIsDeleted(YesNoEnum.NO.getValue());
+                        approveRecordInfo.setCreateUser(approveRecord.getApplicantIdcard());
+                        approveRecordInfo.setCreateTime(Timestamp.valueOf(approveRecord.getApplyTime()));
+                        approveRecordMapper.insert(approveRecordInfo);
+
+                        ApproveQueryRelation approveQueryRelation = new ApproveQueryRelation();
+                        BeanUtils.copyProperties(approveRecord,approveQueryRelation);
+                        approveQueryRelation.setIsDeleted(YesNoEnum.NO.getValue());
+                        approveQueryRelation.setCreateUser(approveRecord.getApplicantIdcard());
+                        approveQueryRelation.setCreateTime(Timestamp.valueOf(approveRecord.getApplyTime()));
+                        //保存关联关系
+                        approveQueryRelation.setApproveRecordId(approveRecordInfo.getId());
+                        approveQueryRelationMapper.insert(approveQueryRelation);
+                        //审批单包含流转记录处理
+                        if (!ObjectUtils.isEmpty(approveRecord.getApproveCirculationList())){
+                            approveRecord.getApproveCirculationList().forEach(
+                                approveCirculation -> {
+                                    ApproveCirculationInfo approveCirculationInfo = new ApproveCirculationInfo();
+                                    BeanUtils.copyProperties(approveCirculation,approveCirculationInfo);
+                                    approveCirculationInfo.setIsDeleted(YesNoEnum.NO.getValue());
+                                    approveCirculationInfo.setCreateUser(approveCirculation.getOperateUserId());
+                                    approveCirculationInfo.setCreateTime(Timestamp.valueOf(approveCirculation.getOperateTime()));
+                                    //保存关联关系
+                                    approveCirculationInfo.setApproveRecordId(approveRecordInfo.getId());
+                                    approveCirculationMapper.insert(approveCirculationInfo);
+                                }
+                            );
+                        }
+                    }
+                );
+            }
+        }catch (ApplicationException ex){
+            logger.error("保存审批单失败!");
+            throw new ApplicationException(ErrorCode.APPROVAL_UPLOAD_EXCEPTION.getCode(), ErrorCode.APPROVAL_UPLOAD_EXCEPTION.getMsg());
+        }
+        return ResponseDTO.newInstance("审批信息报送成功!");
+    }
+}

+ 8 - 3
approve-core-service/src/main/resources/application.yml

@@ -1,10 +1,15 @@
 spring:
 
   datasource:
-    username: jzpt_bu
-    password: dragon
+#    username: jzpt_bu
+#    password: dragon
+#    driver-class-name: com.mysql.jdbc.Driver
+#    url: jdbc:mysql://192.168.120.142:3306/approve?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+
+    username: dcuc
+    password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.120.142:3306/approve?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+    url: jdbc:mysql://10.254.10.31:3306/approve_tjdsj_1.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
 
     #    username: DCUC2_GD
     #    password: dragon

+ 120 - 0
approve-core-service/src/main/resources/config/mysql/V1_1_0003__INITIAL.sql

@@ -0,0 +1,120 @@
+-- 审批单信息表(接口文档)
+CREATE TABLE `t_approve_record_info` (
+	`id` VARCHAR (32) NOT NULL COMMENT '主键',
+	`process_no` VARCHAR (32) NULL DEFAULT NULL COMMENT '流程编号',
+	`process_name` VARCHAR (100) NULL DEFAULT NULL COMMENT '流程名称',
+	`approve_type` VARCHAR (2) NULL DEFAULT NULL COMMENT '审批类型,详见dm_approve_type码表',
+	`approve_no` VARCHAR (64) NULL DEFAULT NULL COMMENT '审批单编号',
+	`approve_title` VARCHAR (100) NULL DEFAULT NULL COMMENT '审批单标题',
+	`applicant_idcard` VARCHAR (18) NULL DEFAULT NULL COMMENT '申请人身份证号码',
+	`applicant_name` VARCHAR (100) NULL DEFAULT NULL COMMENT '申请人姓名',
+	`applicant_phone_no` VARCHAR (20) NULL DEFAULT NULL COMMENT '申请人手机号码',
+	`applicant_org_code` VARCHAR (32) NULL DEFAULT NULL COMMENT '申请人单位代码',
+	`applicant_org_name` VARCHAR (200) NULL DEFAULT NULL COMMENT '申请人单位名称',
+	`apply_time` VARCHAR (30) NULL DEFAULT NULL COMMENT '申请时间',
+	`app_name` VARCHAR (100) NULL DEFAULT NULL COMMENT '应用名称',
+	`app_code` VARCHAR (32) NULL DEFAULT NULL COMMENT '应用编号',
+	`approve_content` VARCHAR (500) NULL DEFAULT NULL COMMENT '审批内容',
+	`access_resources` VARCHAR (200) NULL DEFAULT NULL COMMENT '访问资源',
+	`access_resources_no` VARCHAR (200) NULL DEFAULT NULL COMMENT '访问资源编号',
+	`valid_period_time` VARCHAR (30) NULL DEFAULT NULL COMMENT '有效期',
+	`apply_cause` VARCHAR (300) NULL DEFAULT NULL COMMENT '申请事由',
+	`final_approval_result` VARCHAR (2) NULL DEFAULT NULL COMMENT '最终审批结果,详见dm_approval_result码表',
+	`attachment_url` VARCHAR (100) NULL DEFAULT NULL COMMENT '附件地址',
+	`other_apply_context` VARCHAR (300) NULL DEFAULT NULL COMMENT '其他申请信息',
+	`is_deleted` CHAR (1) DEFAULT NULL COMMENT '是否删除',
+	`create_user` VARCHAR (32) DEFAULT NULL COMMENT '创建人',
+	`create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+	`update_user` VARCHAR (32) DEFAULT NULL COMMENT '更新人',
+	`update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
+	`delete_user` VARCHAR (32) DEFAULT NULL COMMENT '删除人',
+	`delete_time` timestamp NULL DEFAULT NULL COMMENT '删除时间',
+	PRIMARY KEY (`id`)
+) ENGINE = INNODB DEFAULT CHARSET=utf8 COMMENT='审批单信息表';
+
+-- 审批单关联查询记录表
+CREATE TABLE `t_approve_query_relation` (   
+	`id` VARCHAR (32) NOT NULL COMMENT '主键',
+	`approve_record_id` VARCHAR (32) NULL DEFAULT NULL COMMENT '审批单信息记录id',
+	`query_user_type` VARCHAR (20) NULL DEFAULT NULL COMMENT '案件/事件/线索/被查询人员类别', 
+	`query_user_name` VARCHAR (100) NULL DEFAULT NULL COMMENT '案件/事件/线索/被查询人员名称', 
+	`query_user_id` VARCHAR (32) NULL DEFAULT NULL COMMENT '案件/事件/线索/被查询人员编号', 
+	`is_deleted` CHAR (1) DEFAULT NULL COMMENT '是否删除',
+	`create_user` VARCHAR (32) DEFAULT NULL COMMENT '创建人',
+	`create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+	`update_user` VARCHAR (32) DEFAULT NULL COMMENT '更新人',
+	`update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
+	`delete_user` VARCHAR (32) DEFAULT NULL COMMENT '删除人',
+	`delete_time` timestamp NULL DEFAULT NULL COMMENT '删除时间',
+	PRIMARY KEY (`id`)
+) ENGINE = INNODB DEFAULT CHARSET=utf8 COMMENT='审批单信息关联表';
+
+
+-- 审批流转记录表(接口文档)
+CREATE TABLE `t_approve_circulation_info` (
+	`id` VARCHAR (32) NOT NULL COMMENT '主键',
+	`approve_record_id` VARCHAR (32) NULL DEFAULT NULL COMMENT '审批单信息记录id',
+	`approve_no` VARCHAR (64) NULL DEFAULT NULL COMMENT '审批单编号',
+	`process_no` VARCHAR (32) NULL DEFAULT NULL COMMENT '流程编号', 
+	`node_name` VARCHAR (100) NULL DEFAULT NULL COMMENT '节点名称', 
+	`node_no` VARCHAR (32) NULL DEFAULT NULL COMMENT '节点编号',
+	`operate_type` VARCHAR (2) NULL DEFAULT NULL COMMENT '操作类型,详见dm_operate_type码表',
+	`operate_time` VARCHAR (30) NULL DEFAULT NULL COMMENT '操作时间',
+	`operate_user_name` VARCHAR (100) NULL DEFAULT NULL COMMENT '操作人姓名',
+	`operate_user_id` VARCHAR (18) NULL DEFAULT NULL COMMENT '操作人身份证号码',
+	`operate_user_org` VARCHAR (200) NULL DEFAULT NULL COMMENT '操作人单位名称',
+	`operate_user_org_id` VARCHAR (32) NULL DEFAULT NULL COMMENT '操作人单位编号',
+	`approve_opinion` VARCHAR (500) NULL DEFAULT NULL COMMENT '审批意见',
+	`operate_time_consuming` VARCHAR (50) NULL DEFAULT NULL COMMENT '操作耗时',
+	`electronic_signature` VARCHAR (100) NULL DEFAULT NULL COMMENT '电子签名',
+	`is_deleted` CHAR (1) DEFAULT NULL COMMENT '是否删除',
+	`create_user` VARCHAR (32) DEFAULT NULL COMMENT '创建人',
+	`create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+	`update_user` VARCHAR (32) DEFAULT NULL COMMENT '更新人',
+	`update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
+	`delete_user` VARCHAR (32) DEFAULT NULL COMMENT '删除人',
+	`delete_time` timestamp NULL DEFAULT NULL COMMENT '删除时间',
+	PRIMARY KEY (`id`)
+) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = '审批流转记录表';
+
+
+
+-- 审批类型码表
+CREATE TABLE `dm_approve_type` (
+  `code` varchar(6) DEFAULT NULL COMMENT '编号',
+  `name` varchar(100) DEFAULT NULL COMMENT '名称',
+  `sort_no` decimal(5,0) DEFAULT NULL COMMENT '排序'
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='审批类型码表';
+
+
+-- 审批结果码表
+CREATE TABLE `dm_approval_result` (
+  `code` varchar(6) DEFAULT NULL COMMENT '编号',
+  `name` varchar(100) DEFAULT NULL COMMENT '名称',
+  `sort_no` decimal(5,0) DEFAULT NULL COMMENT '排序'
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='审批结果码表';
+
+-- 操作类型码表
+CREATE TABLE `dm_operate_type` (
+  `code` varchar(6) DEFAULT NULL COMMENT '编号',
+  `name` varchar(100) DEFAULT NULL COMMENT '名称',
+  `sort_no` decimal(5,0) DEFAULT NULL COMMENT '排序'
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='操作类型码表';
+
+INSERT INTO `dm_approval_result` (`code`, `name`, `sort_no`) VALUES ('01', '通过', NULL);
+INSERT INTO `dm_approval_result` (`code`, `name`, `sort_no`) VALUES ('02', '不通过', NULL);
+
+
+INSERT INTO `dm_approve_type` (`code`, `name`, `sort_no`) VALUES ('01', '数据查询权限', NULL);
+INSERT INTO `dm_approve_type` (`code`, `name`, `sort_no`) VALUES ('02', '服务访问权限', NULL);
+INSERT INTO `dm_approve_type` (`code`, `name`, `sort_no`) VALUES ('03', '应用功能访问权限', NULL);
+INSERT INTO `dm_approve_type` (`code`, `name`, `sort_no`) VALUES ('04', '业务任务', NULL);
+INSERT INTO `dm_approve_type` (`code`, `name`, `sort_no`) VALUES ('05', '其他', NULL);
+
+
+INSERT INTO `dm_operate_type` (`code`, `name`, `sort_no`) VALUES ('01', '发起', NULL);
+INSERT INTO `dm_operate_type` (`code`, `name`, `sort_no`) VALUES ('02', '撤回', NULL);
+INSERT INTO `dm_operate_type` (`code`, `name`, `sort_no`) VALUES ('03', '通过', NULL);
+INSERT INTO `dm_operate_type` (`code`, `name`, `sort_no`) VALUES ('04', '不通过', NULL);
+INSERT INTO `dm_operate_type` (`code`, `name`, `sort_no`) VALUES ('05', '退回', NULL);
+commit;

+ 213 - 0
approve-core-service/src/main/resources/config/oracle/V1_1_0003__INITIAL.sql

@@ -0,0 +1,213 @@
+CREATE TABLE t_approve_circulation_info (
+id VARCHAR2(32) NOT NULL ,
+approve_record_id VARCHAR2(32) NULL ,
+approve_no VARCHAR2(64) NULL ,
+process_no VARCHAR2(32) NULL ,
+node_name VARCHAR2(100) NULL ,
+node_no VARCHAR2(32) NULL ,
+operate_type VARCHAR2(2) NULL ,
+operate_time VARCHAR2(30) NULL ,
+operate_user_name VARCHAR2(100) NULL ,
+operate_user_id VARCHAR2(18) NULL ,
+operate_user_org VARCHAR2(200) NULL ,
+operate_user_org_id VARCHAR2(32) NULL ,
+approve_opinion VARCHAR2(500) NULL ,
+operate_time_consuming VARCHAR2(50) NULL ,
+electronic_signature VARCHAR2(100) NULL ,
+is_deleted CHAR(1) NULL ,
+create_user VARCHAR2(32) NULL ,
+create_time DATE NULL ,
+update_user VARCHAR2(32) NULL ,
+update_time DATE NULL ,
+delete_user VARCHAR2(32) NULL ,
+delete_time DATE NULL
+)
+
+;
+COMMENT ON TABLE t_approve_circulation_info IS '审批流转记录表';
+COMMENT ON COLUMN t_approve_circulation_info.id IS '主键';
+COMMENT ON COLUMN t_approve_circulation_info.approve_record_id IS '审批单信息记录id';
+COMMENT ON COLUMN t_approve_circulation_info.approve_no IS '审批单编号';
+COMMENT ON COLUMN t_approve_circulation_info.process_no IS '流程编号';
+COMMENT ON COLUMN t_approve_circulation_info.node_name IS '节点名称';
+COMMENT ON COLUMN t_approve_circulation_info.node_no IS '节点编号';
+COMMENT ON COLUMN t_approve_circulation_info.operate_type IS '操作类型,详见dm_operate_type码表';
+COMMENT ON COLUMN t_approve_circulation_info.operate_time IS '操作时间';
+COMMENT ON COLUMN t_approve_circulation_info.operate_user_name IS '操作人姓名';
+COMMENT ON COLUMN t_approve_circulation_info.operate_user_id IS '操作人身份证号码';
+COMMENT ON COLUMN t_approve_circulation_info.operate_user_org IS '操作人单位名称';
+COMMENT ON COLUMN t_approve_circulation_info.operate_user_org_id IS '操作人单位编号';
+COMMENT ON COLUMN t_approve_circulation_info.approve_opinion IS '审批意见';
+COMMENT ON COLUMN t_approve_circulation_info.operate_time_consuming IS '操作耗时';
+COMMENT ON COLUMN t_approve_circulation_info.electronic_signature IS '电子签名';
+COMMENT ON COLUMN t_approve_circulation_info.is_deleted IS '是否删除';
+COMMENT ON COLUMN t_approve_circulation_info.create_user IS '创建人';
+COMMENT ON COLUMN t_approve_circulation_info.create_time IS '创建时间';
+COMMENT ON COLUMN t_approve_circulation_info.update_user IS '更新人';
+COMMENT ON COLUMN t_approve_circulation_info.update_time IS '更新时间';
+COMMENT ON COLUMN t_approve_circulation_info.delete_user IS '删除人';
+COMMENT ON COLUMN t_approve_circulation_info.delete_time IS '删除时间';
+
+
+CREATE TABLE t_approve_query_relation (
+id VARCHAR2(32) NOT NULL ,
+approve_record_id VARCHAR2(32) NULL ,
+query_user_type VARCHAR2(20) NULL ,
+query_user_name VARCHAR2(100) NULL ,
+query_user_id VARCHAR2(32) NULL ,
+is_deleted CHAR(1) NULL ,
+create_user VARCHAR2(32) NULL ,
+create_time DATE NULL ,
+update_user VARCHAR2(32) NULL ,
+update_time DATE NULL ,
+delete_user VARCHAR2(32) NULL ,
+delete_time DATE NULL
+)
+
+;
+COMMENT ON TABLE t_approve_query_relation IS '审批单信息关联表';
+COMMENT ON COLUMN t_approve_query_relation.id IS '主键';
+COMMENT ON COLUMN t_approve_query_relation.approve_record_id IS '审批单信息记录id';
+COMMENT ON COLUMN t_approve_query_relation.query_user_type IS '案件/事件/线索/被查询人员类别';
+COMMENT ON COLUMN t_approve_query_relation.query_user_name IS '案件/事件/线索/被查询人员名称';
+COMMENT ON COLUMN t_approve_query_relation.query_user_id IS '案件/事件/线索/被查询人员编号';
+COMMENT ON COLUMN t_approve_query_relation.is_deleted IS '是否删除';
+COMMENT ON COLUMN t_approve_query_relation.create_user IS '创建人';
+COMMENT ON COLUMN t_approve_query_relation.create_time IS '创建时间';
+COMMENT ON COLUMN t_approve_query_relation.update_user IS '更新人';
+COMMENT ON COLUMN t_approve_query_relation.update_time IS '更新时间';
+COMMENT ON COLUMN t_approve_query_relation.delete_user IS '删除人';
+COMMENT ON COLUMN t_approve_query_relation.delete_time IS '删除时间';
+
+
+CREATE TABLE t_approve_record_info (
+id VARCHAR2(32) NOT NULL ,
+process_no VARCHAR2(32) NULL ,
+process_name VARCHAR2(100) NULL ,
+approve_type VARCHAR2(2) NULL ,
+approve_no VARCHAR2(64) NULL ,
+approve_title VARCHAR2(100) NULL ,
+applicant_idcard VARCHAR2(18) NULL ,
+applicant_name VARCHAR2(100) NULL ,
+applicant_phone_no VARCHAR2(20) NULL ,
+applicant_org_code VARCHAR2(32) NULL ,
+applicant_org_name VARCHAR2(200) NULL ,
+apply_time VARCHAR2(30) NULL ,
+app_name VARCHAR2(100) NULL ,
+app_code VARCHAR2(32) NULL ,
+approve_content VARCHAR2(500) NULL ,
+access_resources VARCHAR2(200) NULL ,
+access_resources_no VARCHAR2(200) NULL ,
+valid_period_time VARCHAR2(30) NULL ,
+apply_cause VARCHAR2(300) NULL ,
+final_approval_result VARCHAR2(2) NULL ,
+attachment_url VARCHAR2(100) NULL ,
+other_apply_context VARCHAR2(300) NULL ,
+is_deleted CHAR(1) NULL ,
+create_user VARCHAR2(32) NULL ,
+create_time DATE NULL ,
+update_user VARCHAR2(32) NULL ,
+update_time DATE NULL ,
+delete_user VARCHAR2(32) NULL ,
+delete_time DATE NULL
+)
+
+;
+COMMENT ON TABLE t_approve_record_info IS '审批单信息表';
+COMMENT ON COLUMN t_approve_record_info.id IS '主键';
+COMMENT ON COLUMN t_approve_record_info.process_no IS '流程编号';
+COMMENT ON COLUMN t_approve_record_info.process_name IS '流程名称';
+COMMENT ON COLUMN t_approve_record_info.approve_type IS '审批类型,详见dm_approve_type码表';
+COMMENT ON COLUMN t_approve_record_info.approve_no IS '审批单编号';
+COMMENT ON COLUMN t_approve_record_info.approve_title IS '审批单标题';
+COMMENT ON COLUMN t_approve_record_info.applicant_idcard IS '申请人身份证号码';
+COMMENT ON COLUMN t_approve_record_info.applicant_name IS '申请人姓名';
+COMMENT ON COLUMN t_approve_record_info.applicant_phone_no IS '申请人手机号码';
+COMMENT ON COLUMN t_approve_record_info.applicant_org_code IS '申请人单位代码';
+COMMENT ON COLUMN t_approve_record_info.applicant_org_name IS '申请人单位名称';
+COMMENT ON COLUMN t_approve_record_info.apply_time IS '申请时间';
+COMMENT ON COLUMN t_approve_record_info.app_name IS '应用名称';
+COMMENT ON COLUMN t_approve_record_info.app_code IS '应用编号';
+COMMENT ON COLUMN t_approve_record_info.approve_content IS '审批内容';
+COMMENT ON COLUMN t_approve_record_info.access_resources IS '访问资源';
+COMMENT ON COLUMN t_approve_record_info.access_resources_no IS '访问资源编号';
+COMMENT ON COLUMN t_approve_record_info.valid_period_time IS '有效期';
+COMMENT ON COLUMN t_approve_record_info.apply_cause IS '申请事由';
+COMMENT ON COLUMN t_approve_record_info.final_approval_result IS '最终审批结果,详见dm_approval_result码表';
+COMMENT ON COLUMN t_approve_record_info.attachment_url IS '附件地址';
+COMMENT ON COLUMN t_approve_record_info.other_apply_context IS '其他申请信息';
+COMMENT ON COLUMN t_approve_record_info.is_deleted IS '是否删除';
+COMMENT ON COLUMN t_approve_record_info.create_user IS '创建人';
+COMMENT ON COLUMN t_approve_record_info.create_time IS '创建时间';
+COMMENT ON COLUMN t_approve_record_info.update_user IS '更新人';
+COMMENT ON COLUMN t_approve_record_info.update_time IS '更新时间';
+COMMENT ON COLUMN t_approve_record_info.delete_user IS '删除人';
+COMMENT ON COLUMN t_approve_record_info.delete_time IS '删除时间';
+
+
+ALTER TABLE t_approve_circulation_info ADD PRIMARY KEY (id);
+
+
+ALTER TABLE t_approve_query_relation ADD PRIMARY KEY (id);
+
+
+ALTER TABLE t_approve_record_info ADD PRIMARY KEY (id);
+
+
+
+CREATE TABLE dm_approval_result (
+code VARCHAR2(6) NULL ,
+name VARCHAR2(100) NULL ,
+sort_no NUMBER NULL
+)
+
+;
+COMMENT ON TABLE dm_approval_result IS '审批结果码表';
+COMMENT ON COLUMN dm_approval_result.code IS '编号';
+COMMENT ON COLUMN dm_approval_result.name IS '名称';
+COMMENT ON COLUMN dm_approval_result.sort_no IS '排序';
+
+
+CREATE TABLE dm_approve_type (
+code VARCHAR2(6) NULL ,
+name VARCHAR2(100) NULL ,
+sort_no NUMBER NULL
+)
+
+;
+COMMENT ON TABLE dm_approve_type IS '审批类型码表';
+COMMENT ON COLUMN dm_approve_type.code IS '编号';
+COMMENT ON COLUMN dm_approve_type.name IS '名称';
+COMMENT ON COLUMN dm_approve_type.sort_no IS '排序';
+
+
+CREATE TABLE dm_operate_type (
+code VARCHAR2(6) NULL ,
+name VARCHAR2(100) NULL ,
+sort_no NUMBER NULL
+)
+
+;
+COMMENT ON TABLE dm_operate_type IS '操作类型码表';
+COMMENT ON COLUMN dm_operate_type.code IS '编号';
+COMMENT ON COLUMN dm_operate_type.name IS '名称';
+COMMENT ON COLUMN dm_operate_type.sort_no IS '排序';
+
+
+INSERT INTO dm_approval_result (code, name, sort_no) VALUES ('01', '通过', NULL);
+INSERT INTO dm_approval_result (code, name, sort_no) VALUES ('02', '不通过', NULL);
+
+
+INSERT INTO dm_approve_type (code, name, sort_no) VALUES ('01', '数据查询权限', NULL);
+INSERT INTO dm_approve_type (code, name, sort_no) VALUES ('02', '服务访问权限', NULL);
+INSERT INTO dm_approve_type (code, name, sort_no) VALUES ('03', '应用功能访问权限', NULL);
+INSERT INTO dm_approve_type (code, name, sort_no) VALUES ('04', '业务任务', NULL);
+INSERT INTO dm_approve_type (code, name, sort_no) VALUES ('05', '其他', NULL);
+
+
+INSERT INTO dm_operate_type (code, name, sort_no) VALUES ('01', '发起', NULL);
+INSERT INTO dm_operate_type (code, name, sort_no) VALUES ('02', '撤回', NULL);
+INSERT INTO dm_operate_type (code, name, sort_no) VALUES ('03', '通过', NULL);
+INSERT INTO dm_operate_type (code, name, sort_no) VALUES ('04', '不通过', NULL);
+INSERT INTO dm_operate_type (code, name, sort_no) VALUES ('05', '退回', NULL);
+commit;

+ 5 - 0
approve-core-service/src/main/resources/mapping/ApproveCirculationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dragonsoft.dcuc.approve.mapper.ApproveCirculationMapper">
+
+</mapper>

+ 4 - 0
approve-core-service/src/main/resources/mapping/ApproveQueryRelationMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dragonsoft.dcuc.approve.mapper.ApproveQueryRelationMapper">
+</mapper>

+ 4 - 0
approve-core-service/src/main/resources/mapping/ApproveRecordMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dragonsoft.dcuc.approve.mapper.ApproveRecordMapper">
+</mapper>

+ 1 - 1
pom.xml

@@ -5,7 +5,7 @@
 
 
     <groupId>com.dragoninfo.dcuc</groupId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>approve-core</artifactId>