Merge branch 'master' into develop

.drone.yml

@@ -18,7 +18,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - cp run.sh /home/build/ezhizao_yzbh_financial/run.sh
 
   - name: build-start
-    image: appleboy/drone-ssh # SSH工具镜像
+    image: appleboy/drone-ssh:1.7.7 # SSH工具镜像
     settings:
       host: 124.70.62.143 # 远程连接地址
       username:

Dockerfile

@@ -1,6 +1,5 @@
 # 基础镜像
-#FROM ibm-semeru-runtimes:open-8-jre
-FROM openjdk:8
+FROM swr.cn-north-4.myhuaweicloud.com/cloud-zhanglingyang/ibm-semeru-runtimes:open-8-jre
 
 # 创建挂载目录
 RUN mkdir -p /jar

run.sh

@@ -12,16 +12,30 @@ app_version='1.0-SNAPSHOT'
 app_port=8044
 # 定义应用环境
 profile_active='linux'
-echo '----copy jar----'
+
+# 删除镜像
+# docker rmi ${group_name}/${app_name}:${app_version}
+# echo '----rm image----'
+
+# 打包编译docker镜像
+docker build -t ${group_name}/${app_name}:${app_version} .
+
+if [ $? -eq 0 ]; then
+    echo '----build image success----'
+else
+    echo '----build image fail----'
+    exit 1
+fi
+
+# 停止容器
 docker stop ${app_name}
 echo '----stop container----'
+
+# 删除容器
 docker rm ${app_name}
 echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
+
+# 启动容器
 docker run -p ${app_port}:${app_port} --name ${app_name} --network yzbh_network \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
@@ -29,5 +43,6 @@ docker run -p ${app_port}:${app_port} --name ${app_name} --network yzbh_network
 -v /home/files:/home/files \
 -d ${group_name}/${app_name}:${app_version}
 echo '----start container----'
+
 docker system prune -f
 echo '----clear docker----'

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -52,6 +52,7 @@ import java.io.BufferedInputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -85,6 +86,7 @@ public class BizCollectionController extends BaseController {
     @Resource
     IBizTaskTypeService taskTypeService;
 
+
     @Resource
     ISysDictDataService sysDictDataService;
     @PreAuthorize("@ss.hasPermi('business:collection:query')")
@@ -94,13 +96,23 @@ public class BizCollectionController extends BaseController {
         BizCollection collection = getForId(id);
         return success(collection);
     }
+
     @GetMapping(value = "/detail/{id}")
     @ResponseBody
     public AjaxResult getCollectionDetailByInputId(@PathVariable Long id) {
+        ArrayList<BizCollectionDetail> bizCollectionDetails = new ArrayList<>();
         //实收金额
-        List<BizCollectionDetail> list = collectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>().eq(BizCollectionDetail::getContractId, id));
+        List<BizCollectionDetail> list = collectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
+                .eq(BizCollectionDetail::getContractId, id));
+        for (BizCollectionDetail detail : list) {
+            Long collectionId = detail.getCollectionId();
+            BizCollection byId = collectionService.getById(collectionId);
+            if (byId.getStatus()!=2){
+                bizCollectionDetails.add(detail);
+            }
+        }
 //        BigDecimal detailAmount  = list.stream().map(m -> m.getArriveAmount()).reduce(BigDecimal::add).get();
-        return success(list);
+        return success(bizCollectionDetails);
     }
 
     @ApiOperation(value = "主从保存", notes = "主从保存")
@@ -185,7 +197,7 @@ public class BizCollectionController extends BaseController {
         startOrderBy();
         List<BizCollection> list = collectionService.getListByBean(conditions);
         list.forEach(l -> {
-            switch (l.getStatus()){
+            switch (l.getStatus()) {
                 case 0:
                     l.setStatusName("未审核");
                     break;
@@ -196,7 +208,7 @@ public class BizCollectionController extends BaseController {
                     l.setStatusName("审核不通过");
                     break;
             }
-            switch (l.getArriveStatus()){
+            switch (l.getArriveStatus()) {
                 case 0:
                     l.setArriveStatusName("未支付");
                     break;
@@ -349,7 +361,7 @@ public class BizCollectionController extends BaseController {
                     contract.setCollectionStatus((byte) (collection.getStatus() == 1 ? 2 : 3));
                     archiveInputService.saveOrUpdate(contract);
                 }
-                if(!CollectionUtils.isEmpty(collection.getEvidenceFiles())){
+                if (!CollectionUtils.isEmpty(collection.getEvidenceFiles())) {
                     List<SysFileStorage> fileStorageList = collection.getEvidenceFiles();
                     fileStorageList.forEach(l -> {
                         l.setId(l.getId() == null || l.getId().equals(0L) ? snowflakeIdWorker.nextId() : l.getId());
@@ -532,9 +544,9 @@ public class BizCollectionController extends BaseController {
     @ApiOperation("收款统计报表")
     @GetMapping("/statistics")
 //    @PreAuthorize("@ss.hasPermi('business:collection:statistics')")
-    public TableDataInfo statistics( ReqStatisticsVo conditions) throws NoSuchFieldException, IllegalAccessException {
+    public TableDataInfo statistics(ReqStatisticsVo conditions) throws NoSuchFieldException, IllegalAccessException {
         startPage();
-        List<ResStatisticsVo> list  =  collectionService.statistics(conditions);
+        List<ResStatisticsVo> list = collectionService.statistics(conditions);
         return getDataTable(list);
     }
 
@@ -543,14 +555,14 @@ public class BizCollectionController extends BaseController {
     @Log(title = "导出收款统计报表", businessType = BusinessType.EXPORT)
     @PostMapping("/exportStatistics")
     public void exportStatistics(ReqStatisticsVo conditions, HttpServletResponse response) throws NoSuchFieldException, IllegalAccessException {
-        List<ResStatisticsVo> list  =  collectionService.statistics(conditions);
+        List<ResStatisticsVo> list = collectionService.statistics(conditions);
         ExcelUtil<ResStatisticsVo> util = new ExcelUtil<ResStatisticsVo>(ResStatisticsVo.class);
         util.exportExcel(response, list, "工资数据");
     }
 
     @ApiOperation("获取任务列表")
     @PostMapping("/listTask")
-    public List<BizTaskType>  listTask(){
+    public List<BizTaskType> listTask() {
         return taskTypeService.getList(new BizTaskType());
     }
 

src/main/resources/application-dev.yml

@@ -34,7 +34,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://82.156.209.15:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://82.156.209.15:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=360000&socketTimeout=360000
                 username: admin
                 password: admin
 #                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8

src/main/resources/application-linux.yml

@@ -33,7 +33,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.18.0.1:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.18.0.1:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=360000&socketTimeout=360000
                 username: root
                 password: ezhizao.cn123456
             # 从库数据源