合并分支

src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java

@@ -12,6 +12,11 @@ import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
+import com.qs.serve.modules.tbs.service.TbsCostApplyService;
+import com.qs.serve.modules.tzc.entity.TzcPolicy;
+import com.qs.serve.modules.tzc.service.TzcPolicyService;
+import com.qs.serve.modules.vtb.entity.VtbVerification;
+import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +38,9 @@ public class SeeYonController {
 
     private SeeYonRequestBaseService seeYonRequestBaseService;
     private SysUserService sysUserService;
+    private TbsCostApplyService costApplyService;
+    private VtbVerificationService verificationService;
+    private TzcPolicyService policyService;
 
     /**
      * 我的审批列表
@@ -48,6 +56,20 @@ public class SeeYonController {
         return listAllCha(query);
     }
 
+    /**
+     * 统计未完成
+     * @param query
+     * @return
+     */
+    @GetMapping("count")
+    public R<Long> getCount(SeeYonApproveQuery query){
+        String userId = AuthContextUtils.getSysUserId();
+        SysUser sysUser = sysUserService.getById(userId);
+        sysUser.checkSyAccount();
+        query.setMemberId(sysUser.getSyUserId());
+        return R.ok(123456L);
+    }
+
     /**
      * 所有审批
      * @param query
@@ -68,7 +90,16 @@ public class SeeYonController {
                         String tempCode = obj.getTemplateCode().replace("_Test","");
                         tempCode = tempCode.replace("contractApply","CostBill");
                         obj.setTemplateCode(tempCode);
-
+                        //设置实体类
+                        Object info = null;
+                        if (tempCode.equals("CheckCost")) {
+                            info = verificationService.getById(obj.getTargetId());
+                        }else if (tempCode.equals("CostBill")){
+                            info = costApplyService.getById(obj.getTargetId());
+                        }else if (tempCode.equals("ReleasePolicy")){
+                            info = policyService.getById(obj.getTargetId());
+                        }
+                        obj.setValueInfo(info);
                         affairList.add(obj);
                     }
                 }

src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.seeyon.entity.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -61,16 +62,22 @@ public class SeeYonApproveQuery {
     /**
      * 申请开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate applyStartDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate applyEndDate;
 
     /**
      * 评论结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate commitEndDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate commitStartDate;
 

src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.seeyon.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.qs.serve.common.util.model.QsJsonLocalDateTimeDeserializer;
 import lombok.Data;
@@ -65,4 +66,7 @@ public class SeeYonApproveDataVo {
     @JsonDeserialize(using = QsJsonLocalDateTimeDeserializer.class)
     private LocalDateTime commitTime;
 
+
+    private Object valueInfo;
+
 }

src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml

@@ -47,6 +47,7 @@
         AND tb.budget_state = 1
         AND tsib.start_date >= #{query.actStartDate}
         AND tsib.end_date <= #{query.actEndDate}
+
         AND (
             <foreach collection="query.queryGoodsGroups" item ="item" index="i" open="(" close=")" separator="or">
                 ( tbc.target_type=#{item.targetType} and tbc.target_id = #{item.targetId} )