Merge remote-tracking branch 'origin/muti_db' into muti_db

src/main/java/com/qs/serve/modules/bir/entity/so/BirBudgetTargetSo.java

@@ -71,5 +71,6 @@ public class BirBudgetTargetSo {
 
     private List<String> supplierCodes;
 
-
+    //用于查询某类成本中心的所有成本中心
+    private List<String> centerType;
 }

src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java

@@ -138,7 +138,7 @@ public class BirBudgetTargetServiceImpl extends ServiceImpl<BirBudgetTargetMappe
         query.setYearMonthStartQuery(startMonth.getYear()*100 + startMonth.getMonthValue());
         query.setYearMonthEndQuery(endMonth.getYear()*100 + endMonth.getMonthValue());
         query.setSelectCenterFlag(0);
-        if(CollUtil.isNotEmpty(query.getCenterList())){
+        if(CollUtil.isNotEmpty(query.getCenterList()) || CollectionUtil.isNotEmpty(query.getCenterType())){
             query.setSelectCenterFlag(1);
         }
         initQuery(query);

src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java

@@ -14,6 +14,7 @@ import com.qs.serve.modules.bms.entity.BmsCenterRegion;
 import com.qs.serve.modules.bms.entity.BmsMasterUser;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.bo.BmsCostCenterBo;
+import com.qs.serve.modules.bms.entity.so.BmsCostCenterTreeSo;
 import com.qs.serve.modules.bms.entity.vo.BmsCostCenterTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsMasterUserCenterVo;
 import com.qs.serve.modules.bms.entity.vo.BmsSubjectTreeVo;
@@ -63,17 +64,17 @@ public class BmsCostCenterController {
 
     /**
      * 树查询
-     * @param loadByCurrent 值=1，过滤当前用户负责数据
+     * @param so loadByCurrent 值=1，过滤当前用户负责数据
      * @return
      */
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:costCenter:query')")
-    public R<List<BmsCostCenterTreeVo>> getTree(Integer loadByCurrent,Integer type, String targetId){
+    public R<List<BmsCostCenterTreeVo>> getTree(BmsCostCenterTreeSo so){
-        if(loadByCurrent!=null&&loadByCurrent.equals(1)){
+        if(so.getLoadByCurrent()!=null&&so.getLoadByCurrent().equals(1)){
             return getTreeByCurrentUser();
         }
-        if(loadByCurrent!=null&&loadByCurrent.equals(2)){
+        if(so.getLoadByCurrent()!=null&&so.getLoadByCurrent().equals(2)){
-            return getListByCustomerId(type,targetId);
+            return getListByCustomerId(so);
         }
         List<BmsCostCenter> list = bmsCostCenterService.list(new LambdaQueryWrapper<BmsCostCenter>().orderByDesc(BmsCostCenter::getId));
         List<BmsCostCenterTreeVo> treeVoList = list.stream().map(obj->{
@@ -86,11 +87,13 @@ public class BmsCostCenterController {
         return R.ok(TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING));
     }
 
-    public R<List<BmsCostCenterTreeVo>> getListByCustomerId(Integer type, String targetId) {
+    public R<List<BmsCostCenterTreeVo>> getListByCustomerId(BmsCostCenterTreeSo so) {
         BirBudgetTargetSo query = new BirBudgetTargetSo();
-        query.setLoadType(type);
+        query.setLoadType(so.getType());
         query.setSelectCenterFlag(1);
-        query.setTargetId(targetId);
+        query.setTargetId(so.getTargetId());
+        query.setYearMonthStart(so.getYearMonthStart());
+        query.setYearMonthEnd(so.getYearMonthEnd());
         List<String> centerIds =  birBudgetTargetService.getCenterByTargetId(query);
         if(centerIds.size()==0){
             return R.ok(new ArrayList<BmsCostCenterTreeVo>());

src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java

@@ -15,6 +15,7 @@ import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.bo.BmsRegionBatchBo;
+import com.qs.serve.modules.bms.entity.so.BmsBizRegionTreeSo;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
@@ -182,17 +183,19 @@ public class BmsRegion2Controller {
 
     /**
      * 树查询
-     * @param loadByCurrent
+     * @param so
      * @return
      */
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:region:query')")
-    public R<List<BmsRegionTreeVo>> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer onlySupplierFlag,Integer type, String targetId){
+    public R<List<BmsRegionTreeVo>> getTree(BmsBizRegionTreeSo so){
-        if(loadByCurrent!=null&&loadByCurrent.equals(2)) {
+        if(so.getLoadByCurrent()!=null&&so.getLoadByCurrent().equals(2)) {
             BirBudgetTargetSo query = new BirBudgetTargetSo();
-            query.setLoadType(type);
+            query.setLoadType(so.getType());
             query.setSelectCenterFlag(3);
-            query.setTargetId(targetId);
+            query.setTargetId(so.getTargetId());
+            query.setYearMonthStart(so.getYearMonthStart());
+            query.setYearMonthEnd(so.getYearMonthEnd());
             List<String> regionIds =  birBudgetTargetService.getCenterByTargetId(query);
             if(regionIds.size()==0){
                 return R.ok(new ArrayList<BmsRegionTreeVo>());
@@ -207,9 +210,9 @@ public class BmsRegion2Controller {
             }
             return R.ok(treeVoList);
         }
-        if(loadByCurrent!=null&&loadByCurrent.equals(1)){
+        if(so.getLoadByCurrent()!=null&&so.getLoadByCurrent().equals(1)){
-            if(onlySupplierFlag!=null&&onlySupplierFlag.equals(1)){
+            if(so.getOnlySupplierFlag()!=null&&so.getOnlySupplierFlag().equals(1)){
-                BmsSupplier supplier = bmsSupplierService.getById(supplierId);
+                BmsSupplier supplier = bmsSupplierService.getById(so.getSupplierId());
                 List<BmsRegion2> rlist = bmsRegion2Service.listByIds(supplier.listBizRegionIds());
                 List<BmsRegionTreeVo> treeVoList = new ArrayList<>();
                 for (BmsRegion2 region2 : rlist) {
@@ -221,10 +224,10 @@ public class BmsRegion2Controller {
                 }
                 return R.ok(treeVoList);
             }else {
-                return R.ok(treeByCurrentUser(supplierId));
+                return R.ok(treeByCurrentUser(so.getSupplierId()));
             }
         }
-        return R.ok(bmsRegion2Service.getTree(listUserFlag!=null&&listUserFlag.equals(1)));
+        return R.ok(bmsRegion2Service.getTree(so.getListUserFlag()!=null&&so.getListUserFlag().equals(1)));
     }
 
     private List<BmsRegionTreeVo> toTreeNodeList2(List<BmsRegion2> list){

src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java

@@ -12,6 +12,7 @@ import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.bo.BmsRegionBatchBo;
+import com.qs.serve.modules.bms.entity.so.BmsSaleRegionTreeSo;
 import com.qs.serve.modules.bms.entity.vo.BmsCostCenterTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.*;
@@ -84,20 +85,19 @@ public class BmsRegionController {
 
     /**
      * 树查询
-     * @param listUserFlag 加载我负责的用户所属的区域
+     * @param so listUserFlag 加载我负责的用户所属的区域 loadByCurrent 值=1，过滤当前用户负责数据(优先级最高) stopFlag  （0，1）是否停用，2->加载所有
-     * @param loadByCurrent 值=1，过滤当前用户负责数据(优先级最高)
-     * @param supplierId
-     * @param stopFlag  （0，1）是否停用，2->加载所有
      * @return
      */
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:region:query')")
-    public R<List<BmsRegionTreeVo>> getTree(Integer listUserFlag,Integer loadByCurrent,String supplierId,Integer stopFlag,Integer type, String targetId){
+    public R<List<BmsRegionTreeVo>> getTree(BmsSaleRegionTreeSo so){
-        if(loadByCurrent!=null&&loadByCurrent.equals(2)) {
+        if(so.getLoadByCurrent()!=null&&so.getLoadByCurrent().equals(2)) {
             BirBudgetTargetSo query = new BirBudgetTargetSo();
-            query.setLoadType(type);
+            query.setLoadType(so.getType());
             query.setSelectCenterFlag(4);
-            query.setTargetId(targetId);
+            query.setTargetId(so.getTargetId());
+            query.setYearMonthStart(so.getYearMonthStart());
+            query.setYearMonthEnd(so.getYearMonthEnd());
             List<String> regionIds =  birBudgetTargetService.getCenterByTargetId(query);
             if(regionIds.size()==0){
                 return R.ok(new ArrayList<BmsRegionTreeVo>());
@@ -112,13 +112,13 @@ public class BmsRegionController {
             }
             return R.ok(treeVoList);
         }
-        if(stopFlag==null){
+        if(so.getStopFlag()==null){
-            stopFlag = 0;
+            so.setStopFlag(0);
         }
-        if(loadByCurrent!=null&&loadByCurrent.equals(1)){
+        if(so.getLoadByCurrent()!=null&&so.getLoadByCurrent().equals(1)){
-            return R.ok(treeByCurrentUser(supplierId,stopFlag));
+            return R.ok(treeByCurrentUser(so.getSupplierId(),so.getStopFlag()));
         }
-        return R.ok(bmsRegionService.getTree(listUserFlag!=null&&listUserFlag.equals(1), stopFlag));
+        return R.ok(bmsRegionService.getTree(so.getListUserFlag()!=null&&so.getListUserFlag().equals(1), so.getStopFlag()));
     }
 
 

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -135,6 +135,8 @@ public class BmsSupplierController {
             query.setLoadType(param.getType());
             query.setSelectCenterFlag(2);
             query.setTargetId(param.getTargetId());
+            query.setYearMonthStart(param.getYearMonthStart());
+            query.setYearMonthEnd(param.getYearMonthEnd());
             List<String> supplierIds =  birBudgetTargetService.getCenterByTargetId(query);
             if(supplierIds.size()==0){
                 return R.byPageHelperList(new ArrayList<BmsSupplier>());

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -389,9 +389,20 @@ public class BmsSupplier implements Serializable {
     //查询审批辅助的参数
     @TableField(exist = false)
     private Integer type;
+
     @TableField(exist = false)
     private String targetId;
 
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthStart;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthEnd;
+
     public List<String> listBizRegionIds(){
         List<String> list = new ArrayList<>();
         list.add(this.getRegion2First());

src/main/java/com/qs/serve/modules/bms/entity/so/BmsBizRegionTreeSo.java

@@ -0,0 +1,44 @@
+package com.qs.serve.modules.bms.entity.so;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 后继成本中心 查询参数
+ * @author YenHex
+ * @since 2023-05-30
+ */
+@Data
+public class BmsBizRegionTreeSo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+//     * @param listUserFlag 加载我负责的用户所属的区域
+//     * @param loadByCurrent 值=1，过滤当前用户负责数据(优先级最高)
+//     * @param supplierId
+//     * @param stopFlag  （0，1）是否停用，2->加载所有
+
+    private Integer listUserFlag;
+
+    private Integer loadByCurrent;
+
+    private String supplierId;
+
+    private Integer onlySupplierFlag;
+
+    private Integer type;
+
+    private String targetId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthStart;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthEnd;
+}
+

src/main/java/com/qs/serve/modules/bms/entity/so/BmsCostCenterTreeSo.java

@@ -0,0 +1,33 @@
+package com.qs.serve.modules.bms.entity.so;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 后继成本中心 查询参数
+ * @author YenHex
+ * @since 2023-05-30
+ */
+@Data
+public class BmsCostCenterTreeSo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer loadByCurrent;
+
+    private Integer type;
+
+    private String targetId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthStart;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthEnd;
+}
+

src/main/java/com/qs/serve/modules/bms/entity/so/BmsSaleRegionTreeSo.java

@@ -0,0 +1,44 @@
+package com.qs.serve.modules.bms.entity.so;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 后继成本中心 查询参数
+ * @author YenHex
+ * @since 2023-05-30
+ */
+@Data
+public class BmsSaleRegionTreeSo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+//     * @param listUserFlag 加载我负责的用户所属的区域
+//     * @param loadByCurrent 值=1，过滤当前用户负责数据(优先级最高)
+//     * @param supplierId
+//     * @param stopFlag  （0，1）是否停用，2->加载所有
+
+    private Integer listUserFlag;
+
+    private Integer loadByCurrent;
+
+    private String supplierId;
+
+    private Integer stopFlag;
+
+    private Integer type;
+
+    private String targetId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthStart;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime yearMonthEnd;
+}
+

src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml

@@ -262,6 +262,11 @@
                 </foreach>
 
             </if>
+            <if test="query.centerType!=null and query.centerType.size > 0">
+                <foreach collection="query.centerType" item="selectId" index="i" >
+                    or (center_type = #{selectId})
+                </foreach>
+            </if>
             )
         </if>
         GROUP BY
@@ -326,6 +331,12 @@
                 #{selectId}
             </foreach>
         </if>
+        <if test="query.yearMonthStartQuery != null">
+            AND key_num &gt;=  #{query.yearMonthStartQuery}
+        </if>
+        <if test="query.yearMonthEndQuery != null">
+            AND key_num &lt;=  #{query.yearMonthEndQuery}
+        </if>
         <if test="query.selectCenterFlag==1">
             and center_type = 'center'
         </if>