diff --git a/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgApplyAmountInfoControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgApplyAmountInfoControllerApi.java
index ed203a8d..c011e7c9 100644
--- a/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgApplyAmountInfoControllerApi.java
+++ b/dq-financial-api/src/main/java/com/daqing/financial/guarantee/DgApplyAmountInfoControllerApi.java
@@ -1,10 +1,6 @@
package com.daqing.financial.guarantee;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
-import com.daqing.framework.domain.hrms.request.LoginRequest;
-import com.daqing.framework.domain.hrms.request.ResetPwdRequest;
-import com.daqing.framework.domain.hrms.request.UpdatePwdRequest;
-import com.daqing.framework.domain.hrms.request.UserLoginRequest;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,4 +29,7 @@ public interface DgApplyAmountInfoControllerApi {
@ApiOperation(value = "上传文件")
ResponseResult uploadFile(MultipartFile[] files)throws IOException;
+ @ApiOperation(value = "删除服务器文件")
+ boolean deleteServerFile(String filePath);
+
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java
index 5702e99f..1eefe4f1 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java
@@ -9,10 +9,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableFeignClients(basePackages = "com.daqing.financial.guarantee.feign")
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
@SpringBootApplication
-@EnableScheduling
+//@EnableScheduling
@EnableSwagger2
+//@ComponentScan(basePackages = "com.daqing.financial.guarantee.mapper")
@ComponentScan(basePackages = "com.daqing")
public class DqFinancialGuaranteeApplication {
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java
new file mode 100644
index 00000000..e631d647
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java
@@ -0,0 +1,13 @@
+package com.daqing.financial.guarantee.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IPageConfig {
+ @Bean
+ public PaginationInterceptor paginationInterceptor() {
+ return new PaginationInterceptor();
+ }
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
index 8dade081..6fa75951 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
@@ -8,7 +8,9 @@ import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
import com.daqing.financial.guarantee.service.impl.DgApplyAmountInfoServiceImpl;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
+import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.model.response.ResponseResult;
+import com.daqing.framework.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +24,9 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
/**
*
@@ -87,19 +91,75 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* void transferTo(File dest) //保存到一个目标文件中。
*/
+ List list = new ArrayList();
for (MultipartFile file : files) { //因为有上传多个文件,所以用的是MultipartFile[]数组,所以要遍历数组保存里面的每一个文件
- String filePath = "D:\\myfile\\i\\"; // 暂时设置保存在D盘的files目录下
+ //String filePath = "http:"+File.separator+File.separator+"www.huorantech.cn"+File.separator+"enclosureFile"+File.separator;// "D:\\myfile\\i\\"; // 暂时设置保存在D盘的files目录下
+ String filePath =PromptSuccess.FILE_URL_PATH;
System.out.println(" 文件名称: " + file.getOriginalFilename());
System.out.println(" 文件大小: " + file.getSize() / 1024D + "Kb");
System.out.println(" 文件类型: " + file.getContentType());
System.out.println(" 属性名称: " + file.getName());
System.out.println();
//在这里执行调用文件保存的方法....
- filePath = filePath + file.getOriginalFilename();
+ String randomId = UUID.randomUUID().toString().replaceAll("-", "").substring(0, 16);
+ filePath = filePath + randomId+file.getOriginalFilename();
file.transferTo(new File(filePath));
filePath = "";
+ list.add(PromptSuccess.ENCLOSUREFILE_URL_PATH+randomId+file.getOriginalFilename());
+
+ }
+ return ResponseResult.SUCCESS(list);
+ }
+
+ /**
+ * 删除服务上的文件
+ * @param filePath 路径
+ * @return
+ */
+ @GetMapping("/deleteServerFile")
+ public boolean deleteServerFile(@RequestParam("filePath")String filePath){
+ log.info("filePath=========="+filePath);
+ boolean delete_flag = false;
+ String certainPath =PromptSuccess.FILE_URL_PATH;
+ filePath = certainPath + filePath;
+ System.out.println("filePath============"+filePath);
+ File file = new File(filePath);
+ if (!file.exists()) {
+ System.out.println("file==============="+file.getName());
+ return delete_flag;
+ }
+ try{
+ delete_flag = file.delete();
+ }catch (Exception e){
+ e.printStackTrace();
}
- return ResponseResult.SUCCESS("上传成功");
+ return delete_flag;
+ }
+
+
+ /**
+ * 业务申请列表
+ * @param
+ * @return
+ */
+ @PostMapping("/businessApplicationList")
+ @ApiOperation(value = "业务申请列表")
+ public ResponseResult businessApplicationList(@RequestParam("page") Integer page,@RequestParam("size") Integer size
+ /* @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName*/){
+ PageUtils data = applyAmountInfoService.queryPage(page, size);
+ return new ResponseResult().SUCCESS(data);
+ }
+
+ /**
+ * 业务申请列表
+ * @param
+ * @return
+ */
+ @PostMapping("/businessApplicationList2")
+ @ApiOperation(value = "业务申请列表")
+ public ResponseResult businessApplicationList2(){
+ List data = applyAmountInfoService.selectList();
+ return new ResponseResult().SUCCESS(data);
}
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java
index 5cd71448..bcd6d6e6 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java
@@ -1,8 +1,14 @@
package com.daqing.financial.guarantee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
@@ -15,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DgApplyAmountInfoMapper extends BaseMapper {
+ //IPage pageByCondition(Page page, @Param("queryMsg")String queryMsg);
+
+ IPage pageByCondition(Page page);
+
+ List selectAmountList();
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java
index 5d1dbdd9..1b031eca 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java
@@ -160,4 +160,10 @@ public class BusinessApplicationRequest implements Serializable {
@ApiModelProperty(value = "反担保资料和评估报告")
private String assessmentReport;
+ /**
+ * 区分保存和提交按钮 true->commit
+ */
+ @ApiModelProperty(value = "区分保存和提交按钮")
+ private boolean isSaveOrCommit;
+
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java
new file mode 100644
index 00000000..9de74d81
--- /dev/null
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java
@@ -0,0 +1,67 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ToString
+public class BusinessApplicationListResponse implements Serializable {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 企业id
+ */
+ @ApiModelProperty(value = "企业id")
+ private Integer companyId;
+
+ /**
+ * 提单人id
+ */
+ @ApiModelProperty(value = "提单人id")
+ private Integer presenterId;
+
+ /**
+ * 申请额度
+ */
+ @ApiModelProperty(value = "申请额度")
+ private BigDecimal applyAmount;
+
+ /**
+ * 申请期限
+ */
+ @ApiModelProperty(value = "申请期限")
+ private String applyTime;
+
+ /**
+ * 申请时间
+ */
+ @ApiModelProperty(value = "申请时间")
+ private Date createTime;
+
+ /**
+ * 业务类型
+ */
+ @ApiModelProperty(value = "业务类型")
+ private String businessType;
+
+ /**
+ * 业务编号
+ */
+ @ApiModelProperty(value = "业务编号")
+ private String businessCode;
+
+
+}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java
index 1ecb00b6..758d7bb3 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java
@@ -3,6 +3,9 @@ package com.daqing.financial.guarantee.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
+import com.daqing.framework.utils.PageUtils;
+
+import java.util.List;
/**
*
@@ -15,4 +18,8 @@ import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
public interface IDgApplyAmountInfoService extends IService {
int businessApplication(BusinessApplicationRequest businessApplication);
+
+ PageUtils queryPage(Integer page, Integer size);
+
+ List selectList();
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index 85f2d4a7..df2e5cae 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -1,13 +1,18 @@
package com.daqing.financial.guarantee.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.daqing.financial.guarantee.mapper.DgApplyAmountInfoMapper;
import com.daqing.financial.guarantee.mapper.DgEnclosureInfoMapper;
import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest;
+import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
import com.daqing.framework.domain.guarantee.DgEnclosureInfo;
+import com.daqing.framework.domain.hrms.ext.PositionVO;
import com.daqing.framework.util.RedisUtil;
+import com.daqing.framework.utils.PageUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -17,6 +22,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
*
@@ -65,6 +71,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl positionVO = this.getBaseMapper().pageByCondition(new Page(page, size));
- return 0;
+ return new PageUtils(positionVO);
}
+
+ @Override
+ public List selectList() {
+ Listlist = dgApplyAmountInfoMapper.selectAmountList();
+ return list;
+ }
+
+
}
diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties
index 3c959dd4..f5c96118 100644
--- a/dq-financial-guarantee/src/main/resources/bootstrap.properties
+++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties
@@ -29,33 +29,21 @@ spring.servlet.multipart.max-request-size=10MB
# 单个文件的最大值
spring.servlet.multipart.max-file-size=10MB
-## jsp
-spring.mvc.view.prefix=/WEB-INF/jsp/
-spring.mvc.view.suffix=.jsp
-
-
-
-
# 正式环境(prod)
#服务名称
-#spring.application.name=dq-financial-hrms
+#spring.application.name=dq-financial-guarantee
##配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
-##spring.cloud.nacos.config.group=prod
+#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
#
-#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true
#
-#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true
#
-#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-#spring.cloud.nacos.config.ext-config[2].group=prod
-#spring.cloud.nacos.config.ext-config[2].refresh=true
-#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml
index 35f65277..34b820a6 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml
@@ -17,5 +17,20 @@
+
+
+
diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties
index 1fe2d28e..beabdee9 100644
--- a/dq-financial-hrms/src/main/resources/bootstrap.properties
+++ b/dq-financial-hrms/src/main/resources/bootstrap.properties
@@ -1,61 +1,61 @@
#服务名称
-#spring.application.name=dq-financial-hrms
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.142:8848
-#spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
-##spring.cloud.nacos.config.group=prod
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-#spring.cloud.nacos.config.ext-config[0].group=dev
-#spring.cloud.nacos.config.ext-config[0].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-#spring.cloud.nacos.config.ext-config[1].group=dev
-#spring.cloud.nacos.config.ext-config[1].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-#spring.cloud.nacos.config.ext-config[2].group=dev
-#spring.cloud.nacos.config.ext-config[2].refresh=true
-#
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=123456
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-#
-#spring.servlet.multipart.max-file-size=10MB
-#spring.servlet.multipart.max-request-size=10MB
-
-# 正式环境(prod)
-#服务名称
spring.application.name=dq-financial-hrms
#配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
+spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
#spring.cloud.nacos.config.group=prod
spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].group=dev
spring.cloud.nacos.config.ext-config[0].refresh=true
spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].group=dev
spring.cloud.nacos.config.ext-config[1].refresh=true
spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].group=dev
spring.cloud.nacos.config.ext-config[2].refresh=true
spring.redis.host=127.0.0.1
spring.redis.port=6379
-spring.redis.password=dq123456
+spring.redis.password=123456
spring.redis.database=0
spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
+spring.redis.jedis.pool.min-idle=0
+
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=10MB
+
+# 正式环境(prod)
+#服务名称
+#spring.application.name=dq-financial-hrms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
\ No newline at end of file
diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
index 11be7832..47fb33e8 100644
--- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
+++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
@@ -35,4 +35,8 @@ public class PromptSuccess {
public static final String IMAGE_URL_PATH = "http://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
+
+ public static final String ENCLOSUREFILE_URL_PATH = "http://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
+
+ public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径
}
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java
index a7eff86e..6c6ef9d1 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java
@@ -84,4 +84,9 @@ public class DgApplyAmountInfo implements Serializable {
*/
private String description;
+ /**
+ * 状态 1->审核中;2->已审核;3->拒绝;4->驳回;
+ */
+ private Integer status;
+
}
diff --git a/pom.xml b/pom.xml
index b9a2f226..a1662b25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
dq-financial-hrms-auth
dq-financial-crms
dq-govern-gateway
-
+
+ dq-financial-guarantee