no message

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

@@ -32,8 +32,6 @@ import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
 import cn.ezhizao.project.system.service.ISysUserService;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,17 +43,13 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "收票 数据接口")
@@ -84,6 +78,7 @@ public class BizCollectionController extends BaseController {
 
     @Resource
     IBizTaskTypeService taskTypeService;
+
     @PreAuthorize("@ss.hasPermi('business:collection:query')")
     @GetMapping(value = "/{id}")
     @ResponseBody
@@ -91,6 +86,7 @@ public class BizCollectionController extends BaseController {
         BizCollection collection = getForId(id);
         return success(collection);
     }
+
     @GetMapping(value = "/detail/{id}")
     @ResponseBody
     public AjaxResult getCollectionDetailByInputId(@PathVariable Long id) {
@@ -182,7 +178,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;
@@ -193,7 +189,7 @@ public class BizCollectionController extends BaseController {
                     l.setStatusName("审核不通过");
                     break;
             }
-            switch (l.getArriveStatus()){
+            switch (l.getArriveStatus()) {
                 case 0:
                     l.setArriveStatusName("未支付");
                     break;
@@ -317,7 +313,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());
@@ -478,9 +474,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);
     }
 
@@ -489,25 +485,28 @@ 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());
     }
 
     @ApiOperation("通过合同id查询具体收入支出")
-    @PostMapping("/getBycontract")
-    public Map<String,List<ResStatisticsVo>>  getByContract(ReqStatisticsVo conditions){
+    @PostMapping("/getByContract")
+    public AjaxResult getByContract(@RequestBody  ReqStatisticsVo conditions) {
+        HashMap<String, List<ResStatisticsVo>> map = new HashMap<>();
         //收款
-      List<ResStatisticsVo> inList =  collectionService.getByContractIn(conditions);
+        List<ResStatisticsVo> inList = collectionService.getByContractIn(conditions);
         //支出
-      List<ResStatisticsVo>outList =   collectionService.getByContractOut(conditions);
-        return null;
+        List<ResStatisticsVo> outList = collectionService.getByContractOut(conditions);
+        map.put("inList", inList);
+        map.put("outList", outList);
+        return success(AjaxResult.success(map));
     }
 
 

src/main/java/cn/ezhizao/project/business/collection/mapper/BizCollectionMapper.java

@@ -43,9 +43,9 @@ public interface BizCollectionMapper extends BaseMapper<BizCollection> {
 
     List<ResStatisticsVo> statistics(@Param("conditions") ReqStatisticsVo conditions);
 
-    List<ResStatisticsVo> getByContractIn(ReqStatisticsVo conditions);
+    List<ResStatisticsVo> getByContractIn(@Param("conditions") ReqStatisticsVo conditions);
 
-    List<ResStatisticsVo> getByContractOut(ReqStatisticsVo conditions);
+    List<ResStatisticsVo> getByContractOut(@Param("conditions") ReqStatisticsVo conditions);
 }
 
 

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
             # 从库数据源

src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -147,7 +147,7 @@
                 #{item}
             </foreach>
         </if>
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
             AND
@@ -191,18 +191,24 @@
         t1.verify_date as examineTime
         FROM
         biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id
+        LEFT JOIN biz_company t3 ON t3.id = t1.company_id
+        LEFT JOIN biz_task_type t4 ON t4.id = t2.task_type_id
+        LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
+        LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_id
         WHERE
         t1.contract_id = #{conditions.contractId}
         AND
-        t2.task_type_id = #{conditions.taskTypeId[0]}
-        <if test="conditions.receiptDateFilter != null and conditions.receiptDateFilter.size() ">
+        t2.task_type_id = #{conditions.taskTypeIds[0]}
+
+
+        <if test="conditions.receiptDateFilter != null and conditions.receiptDateFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(c.arrive_date,'%Y-%m-%d') &gt;= #{conditions.receiptDateFilter[0]}
             AND
             DATE_FORMAT(c.arrive_date,'%Y-%m-%d') &lt;= #{conditions.receiptDateFilter[1]}
             )
         </if>
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND(
             DATE_FORMAT(c.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[1]}
             AND
@@ -229,9 +235,9 @@
         LEFT JOIN biz_task_type t4 ON t4.id = t2.task_type_id
         LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
         LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_id
-        WHERE t1.contract_id = 1806240221966196737
-        AND t2.task_type_id = 2
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        WHERE t1.contract_id = #{conditions.contractId}
+        AND t2.task_type_id = #{conditions.taskTypeIds[0]}
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
             AND
@@ -249,7 +255,7 @@
         FROM biz_payment p
         right join biz_payment_detail de ON p.id = de.payment_id
         WHERE p.verify_status != 4
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
             AND