默认密码校验；模板拓展接口

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -11,6 +11,8 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
+import com.qs.serve.modules.bir.entity.vo.BirCenterCostRateItem;
+import com.qs.serve.modules.bir.entity.vo.BirCenterCostRateMain;
 import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
 import com.qs.serve.modules.bir.entity.vo.BirRoiVo;
 import com.qs.serve.modules.bir.service.BirBaseActivityService;
@@ -21,6 +23,8 @@ import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bir.service.BirRoiRateService;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,6 +41,31 @@ public class BirRoiRateController {
     private BirRoiRateService birRoiRateService;
     private BirBaseActivityService activityService;
 
+    /**
+     * 台账数据集
+     * @return
+     */
+    @GetMapping("/standingBook")
+    public R<List<BirCenterCostRateMain>> getStandingBook(){
+        List<BirCenterCostRateItem> list = new ArrayList<>();
+        BirCenterCostRateItem rateItem = new BirCenterCostRateItem();
+        rateItem.setTargetDispatchAmt(BigDecimal.ZERO);
+        rateItem.setBudgetAmt(new BigDecimal("123456"));
+        rateItem.setTargetRoiRate(new BigDecimal("123456"));
+        rateItem.setRealDispatchAmt(new BigDecimal("123456"));
+        rateItem.setCostAmt(new BigDecimal("123456"));
+        rateItem.setRealRoiRate(new BigDecimal("123456"));
+        rateItem.setCostPassAmt(new BigDecimal("123456"));
+        rateItem.setCostApplyingAmt(new BigDecimal("123456"));
+        rateItem.setCheckedAmt(new BigDecimal("123456"));
+        rateItem.setCheckingAmt(new BigDecimal("123456"));
+        rateItem.setNoCheckAmt(new BigDecimal("123456"));
+        rateItem.setReleaseAmt(new BigDecimal("123456"));
+        rateItem.setFrozenAmt(new BigDecimal("123456"));
+        list.add(rateItem);
+        return R.ok();
+    }
+
     /**
      *
      * @return

src/main/java/com/qs/serve/modules/bir/entity/vo/BirCenterCostRateItem.java

@@ -0,0 +1,79 @@
+package com.qs.serve.modules.bir.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author YenHex
+ * @since 2023/7/3
+ */
+@Data
+public class BirCenterCostRateItem {
+
+    /**
+     * 目标发货金额
+     */
+    private BigDecimal targetDispatchAmt;
+
+    /**
+     * 预算金额
+     */
+    private BigDecimal budgetAmt;
+
+    /**
+     * 目标费率
+     */
+    private BigDecimal targetRoiRate;
+
+    /**
+     * 实际发货金额
+     */
+    private BigDecimal realDispatchAmt;
+
+    /**
+     * 核销费用
+     */
+    private BigDecimal costAmt;
+
+    /**
+     * 实际费率
+     */
+    private BigDecimal realRoiRate;
+
+    /**
+     * 已批准费用金额
+     */
+    private BigDecimal costPassAmt;
+
+    /**
+     * 申请中费用金额
+     */
+    private BigDecimal costApplyingAmt;
+
+    /**
+     * 已核销费用金额
+     */
+    private BigDecimal checkedAmt;
+
+    /**
+     * 未核销金额(申请中)
+     */
+    private BigDecimal checkingAmt;
+
+    /**
+     * 未申请核销金额
+     */
+    private BigDecimal noCheckAmt;
+
+    /**
+     * 已释放金额
+     */
+    private BigDecimal releaseAmt;
+
+    /**
+     * 冻结中
+     */
+    private BigDecimal frozenAmt;
+
+}

src/main/java/com/qs/serve/modules/bir/entity/vo/BirCenterCostRateMain.java

@@ -0,0 +1,21 @@
+package com.qs.serve.modules.bir.entity.vo;
+
+import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
+import com.qs.serve.modules.tbs.entity.vo.TbsBudgetSimpleVo;
+import lombok.Data;
+import java.util.List;
+/**
+ * @author YenHex
+ * @since 2023/7/3
+ */
+@Data
+public class BirCenterCostRateMain {
+
+    private TbsCenterDto center1;
+    private TbsCenterDto center2;
+    private TbsBudgetSimpleVo budgetInfo;
+    private BirCenterCostRateItem yearInfo;
+    private List<BirCenterCostRateItem> seasonList;
+    private List<BirCenterCostRateItem> monthList;
+
+}

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

@@ -81,49 +81,47 @@ public class BmsCostCenterController {
         lqw.eq(BmsMasterUser::getType, MasterUserType.Center);
         List<BmsMasterUser> masterUsers = bmsMasterUserService.list(lqw);
         List<String> centerIds = masterUsers.stream().map(BmsMasterUser::getTargetId).collect(Collectors.toList());
-
+        //防止空指针
-        if(centerIds.size()>0){
+        centerIds.add("0");
-            LambdaQueryWrapper<BmsCostCenter> centerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<BmsCostCenter> centerLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            centerLambdaQueryWrapper.in(BmsCostCenter::getId,centerIds).or().eq(BmsCostCenter::getVisibleFlag,1);
+        centerLambdaQueryWrapper.in(BmsCostCenter::getId,centerIds).or().eq(BmsCostCenter::getVisibleFlag,1);
-            List<BmsCostCenter> costCenters = bmsCostCenterService.list(centerLambdaQueryWrapper);
+        List<BmsCostCenter> costCenters = bmsCostCenterService.list(centerLambdaQueryWrapper);
-            Map<Integer,List<BmsCostCenter>> listMap = costCenters.stream().collect(Collectors.groupingBy(BmsCostCenter::getLevel));
+        Map<Integer,List<BmsCostCenter>> listMap = costCenters.stream().collect(Collectors.groupingBy(BmsCostCenter::getLevel));
-            List<BmsCostCenter> list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1);
+        List<BmsCostCenter> list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1);
-            List<BmsCostCenter> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
+        List<BmsCostCenter> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
-            List<BmsCostCenter> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
+        List<BmsCostCenter> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
-            list3.forEach(obj3->{
+        list3.forEach(obj3->{
-                boolean exist = false;
+            boolean exist = false;
-                for (BmsCostCenter obj2 : list2) {
+            for (BmsCostCenter obj2 : list2) {
-                    if(obj2.getId().equals(obj3.getPid())){
+                if(obj2.getId().equals(obj3.getPid())){
-                        List<BmsCostCenter> childList = obj2.getChildNode()==null?new ArrayList<>():obj2.getChildNode();
+                    List<BmsCostCenter> childList = obj2.getChildNode()==null?new ArrayList<>():obj2.getChildNode();
-                        childList.add(obj3);
+                    childList.add(obj3);
-                        obj2.setChildNode(childList);
+                    obj2.setChildNode(childList);
-                        exist = true;
+                    exist = true;
-                        break;
+                    break;
-                    }
-                }
-                if(!exist){
-                    list2.add(obj3);
-                }
-            });
-            list2.forEach(obj2->{
-                boolean exist = false;
-                for (BmsCostCenter obj1 : list1) {
-                    if(obj1.getId().equals(obj2.getPid())){
-                        List<BmsCostCenter> childList = obj1.getChildNode()==null?new ArrayList<>():obj1.getChildNode();
-                        childList.add(obj2);
-                        obj1.setChildNode(childList);
-                        exist = true;
-                        break;
-                    }
                 }
-                if(!exist){
+            }
-                    list1.add(obj2);
+            if(!exist){
+                list2.add(obj3);
+            }
+        });
+        list2.forEach(obj2->{
+            boolean exist = false;
+            for (BmsCostCenter obj1 : list1) {
+                if(obj1.getId().equals(obj2.getPid())){
+                    List<BmsCostCenter> childList = obj1.getChildNode()==null?new ArrayList<>():obj1.getChildNode();
+                    childList.add(obj2);
+                    obj1.setChildNode(childList);
+                    exist = true;
+                    break;
                 }
-            });
+            }
-            List<BmsCostCenterTreeVo> treeVoList = toTreeNode(list1);
+            if(!exist){
-            return R.ok(treeVoList);
+                list1.add(obj2);
-        }
+            }
-        return R.ok();
+        });
+        List<BmsCostCenterTreeVo> treeVoList = toTreeNode(list1);
+        return R.ok(treeVoList);
     }
 
     private List<BmsCostCenterTreeVo> toTreeNode(List<BmsCostCenter> list){

src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java

@@ -7,10 +7,7 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryLevelBo;
@@ -79,6 +76,33 @@ public class GoodsCategoryController {
         return R.ok(list);
     }
 
+    /**
+     * 返回树节点列表
+     * @apiNote 用于模板,通过ids查询
+     * @param param
+     * @return
+     */
+    @PostMapping("/listTreeVoByParam")
+    public R<List<GoodsCategoryTreeVo>> listTreeVoBySelect(@RequestBody GoodsCategory param){
+        if(CollectionUtil.isEmpty(param.getSelectIds())){
+            return R.ok();
+        }
+        LambdaQueryWrapper<GoodsCategory> categoryWrapper = new LambdaQueryWrapper<>();
+        categoryWrapper.eq(GoodsCategory::getEnable,1);
+        categoryWrapper.in(GoodsCategory::getId,param.getSelectIds());
+        List<GoodsCategory> list = goodsCategoryService.list(categoryWrapper);
+        List<GoodsCategoryTreeVo> treeNodes = list.stream().map(cate->{
+            GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo());
+            treeNode.setId(cate.getId()+"");
+            treeNode.setParentId(cate.getParentId().toString());
+            treeNode.setCostFlag(cate.getCostFlag());
+            treeNode.setSort(cate.getSort()==null ? 0 : cate.getSort());
+            treeNode.setEnable(cate.getEnable()+"");
+            return treeNode;
+        }).collect(Collectors.toList());
+        return R.ok(treeNodes);
+    }
+
     /**
      * 树查询(组件接口)
      * @param param

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -77,6 +77,19 @@ public class GoodsSpuController {
         return this.getPage(param);
     }
 
+    /**
+     * 翻页搜索(组件接口)
+     * @apiNote 用于加载模板选中的商品
+     * @param param
+     * @return
+     */
+    @PostMapping("/shelfPageByParam")
+    public R<List<GoodsSpu>> shelfPageByParam(GoodsSpu param){
+        param.setShelf(1);
+        List<GoodsSpu> list = goodsSpuService.selectSpuList(param);
+        return R.ok(list);
+    }
+
     /**
      * 翻页搜索(管理)
      * @param param

src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java

@@ -10,8 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
-
+import java.util.List;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
 
 /**
@@ -102,5 +101,9 @@ public class GoodsCategory implements Serializable {
     @TableField(exist = false)
     private Integer loadSpuData;
 
+
+    @TableField(exist = false)
+    private List<Long> selectIds;
+
 }
 

src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java

@@ -121,5 +121,8 @@ public class GoodsSpu implements Serializable {
     @TableField(exist = false)
     private String searchValue;
 
+    @TableField(exist = false)
+    private List<Long> selectIds;
+
 }
 

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -54,6 +54,19 @@ public class SysUserController {
     private WxUserService wxUserService;
     private SysUserSalesService sysUserSalesService;
 
+    /**
+     * 检查是否默认密码
+     * @return true；false字符串
+     */
+    @GetMapping("/checkDefaultPassword")
+    public R<String> checkDefaultPassword(){
+        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
+        if(sysUser.getPassword().equals("25d55ad283aa400af464c76d713c07ad")){
+            return R.ok("true","ok");
+        }
+        return R.ok("false","ok");
+    }
+
     /**
      * 获取致远用户列表
      * @param code

src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetSimpleVo.java

@@ -0,0 +1,43 @@
+package com.qs.serve.modules.tbs.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 预算 实体类
+ * @author YenHex
+ * @since 2022-11-12
+ */
+@Data
+public class TbsBudgetSimpleVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 预算编码 */
+    private String budgetCode;
+
+    /** 预算名称 */
+    private String budgetName;
+
+    /** 科目id */
+    private Long subjectId;
+
+    /** 科目编码 */
+    private String subjectCode;
+
+    /** 科目名称 */
+    private String subjectName;
+
+    /** 预算考核期编码 */
+    private String scheduleCode;
+
+    /** 预算考核期名称 */
+    private String scheduleName;
+
+    /** 备注 */
+    private String remark;
+
+}
+

src/main/java/com/qs/serve/modules/third/PortalController.java

@@ -49,6 +49,7 @@ public class PortalController {
     public R<?> ssoLogin(@RequestBody SSOLoginParam ssoLoginParam, HttpServletRequest request){
         ThirdTokenUtil.checkToken(request);
         String host = "https://crm.gdjsl.com";
+        //String host = "http://192.168.0.9:6036/";
         if(StringUtils.hasText(ssoLoginParam.getRewriteHost())){
             host = ssoLoginParam.getRewriteHost();
         }

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -81,8 +81,13 @@
             <if test="query.updateBy != null and query.updateBy != ''"> and `goods_spu`.`update_by` = #{query.updateBy}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `goods_spu`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.delFlag != null and query.delFlag != ''"> and `goods_spu`.`del_flag` = #{query.delFlag}</if>
-
             <if test="query.searchValue != null and query.searchValue != ''"> and (`goods_spu`.`name` like concat('%',#{query.searchValue},'%') or `goods_spu`.`goods_spu` like concat('%',#{query.searchValue},'%')) </if>
+            <if test="query.selectIds!=null and query.selectIds.size > 0">
+                and `goods_spu`.`id`
+                <foreach collection="query.selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
         </where>
     </select>