Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessProcessStatusController.java

@@ -0,0 +1,21 @@
+package com.daqing.financial.guarantee.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 业务流程状态表 前端控制器
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-25
+ */
+@RestController
+@RequestMapping("/dg-business-process-status")
+public class DgBusinessProcessStatusController {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgBusinessProcessStatusMapper.java

@@ -0,0 +1,19 @@
+package com.daqing.financial.guarantee.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.guarantee.DgBusinessProcessStatus;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 业务流程状态表 Mapper 接口
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-25
+ */
+@Mapper
+public interface DgBusinessProcessStatusMapper extends BaseMapper<DgBusinessProcessStatus> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java

@@ -106,9 +106,17 @@ public class BusinessApplicationListResponse extends BaseRowModel implements Ser
     /**
      * 状态
      */
-    @ExcelProperty(value = "状态",index = 7)
-    @ApiModelProperty(value = "状态")
+    @ExcelProperty(value = "审批状态",index = 7)
+    @ApiModelProperty(value = "审批状态")
     private Integer status;
 
+    @ExcelProperty(value = "业务状态",index = 8)
+    @ApiModelProperty(value = "业务状态")
+    private Integer businessStatus;
+
+    @ExcelProperty(value = "操作状态",index = 9)
+    @ApiModelProperty(value = "操作状态")
+    private Integer operatingStatus;
+
 
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgBusinessProcessStatusService.java

@@ -0,0 +1,17 @@
+package com.daqing.financial.guarantee.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.guarantee.DgBusinessProcessStatus;
+
+/**
+ * <p>
+ * 业务流程状态表 服务类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-25
+ */
+public interface IDgBusinessProcessStatusService extends IService<DgBusinessProcessStatus> {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -78,6 +78,9 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
     @Resource
     private DgApplyAmountListMapper dgApplyAmountListMapper;
 
+    @Resource
+    private DgBusinessProcessStatusMapper dgBusinessProcessStatusMapper;
+
 
     @Override
     @Transactional
@@ -166,8 +169,13 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             applyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//状态设置为审核中
             applyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
             dgApplyAmountListMapper.insert(applyAmountList);
-        }
 
+            //同时往业务流程状态表新增一条记录
+            DgBusinessProcessStatus status = new DgBusinessProcessStatus();
+            status.setBusinessId(dgApplyAmountInfo.getId());
+            status.setBusinessStatus(StatusCode.YW_IN_PROGRESS);//业务状态设置为进行中
+            dgBusinessProcessStatusMapper.insert(status);
+        }
         return 1;
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgBusinessProcessStatusServiceImpl.java

@@ -0,0 +1,20 @@
+package com.daqing.financial.guarantee.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.financial.guarantee.mapper.DgBusinessProcessStatusMapper;
+import com.daqing.financial.guarantee.service.IDgBusinessProcessStatusService;
+import com.daqing.framework.domain.guarantee.DgBusinessProcessStatus;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务流程状态表 服务实现类
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-25
+ */
+@Service
+public class DgBusinessProcessStatusServiceImpl extends ServiceImpl<DgBusinessProcessStatusMapper, DgBusinessProcessStatus> implements IDgBusinessProcessStatusService {
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/MyBatisPlusCodeGenerator.java

@@ -25,7 +25,7 @@ public class MyBatisPlusCodeGenerator {
     public static final String PACKAGE_NAME = "com.daqing.financial.guarantee";
 
     public static void main(String[] args) {
-        String[] tables = new String[] {"dg_apply_amount_list"};//表名数组
+        String[] tables = new String[] {"dg_business_process_status"};//表名数组
         String[] tablePrefixs = new String[] {""};//去掉前缀
         executeCode(PACKAGE_NAME,tables,tablePrefixs);
     }

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgBusinessProcessStatusMapper.xml

@@ -0,0 +1,12 @@
+<?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.daqing.financial.guarantee.mapper.DgBusinessProcessStatusMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgBusinessProcessStatus">
+        <id column="id" property="id" />
+        <result column="business_id" property="businessId" />
+        <result column="business_status" property="businessStatus" />
+    </resultMap>
+
+</mapper>

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgBusinessProcessStatus.java

@@ -0,0 +1,39 @@
+package com.daqing.framework.domain.guarantee;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 业务流程状态表
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-25
+ */
+@Data
+@TableName("dg_business_process_status")
+public class DgBusinessProcessStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 业务id
+     */
+    private Integer businessId;
+
+    /**
+     * 业务状态：1->进行中；2->已完成；3->已否决；
+     */
+    private Integer businessStatus;
+}