客户拜访调整、政策异常修复

src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java

@@ -56,6 +56,7 @@ public class BizCusVisitController {
     @PreAuthorize("hasRole('biz:cusVisit:query')")
     public R<PageVo<BizCusVisit>> getPage(BizCusVisit param){
         LambdaQueryWrapper<BizCusVisit> lqw = new LambdaQueryWrapper<>(param);
+        lqw.orderByDesc(BizCusVisit::getId);
         PageUtil.startPage();
         List<BizCusVisit> list = bizCusVisitService.list(lqw);
         return R.byPageHelperList(list);

src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java

@@ -27,7 +27,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * API业务 拜访日志2
+ * API业务 客户拜访日志
  * @author YenHex
  * @since 2022-10-26
  */
@@ -76,6 +76,9 @@ public class BizCusVisitApi {
     @GetMapping("/page4Under")
     public R<PageVo<BizCusVisit>> page4Under(BizCusVisit param){
         List<String> userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId());
+        if(userIds.size()<1){
+            return R.byEmptyList();
+        }
         PageUtil.startPage();
         LambdaQueryWrapper<BizCusVisit> visitWrapper = new LambdaQueryWrapper<>(param);
         visitWrapper.in(BizCusVisit::getVisitorId,userIds);
@@ -157,6 +160,7 @@ public class BizCusVisitApi {
                     cusVisit.setSignTypeForm(visitForm.getFormContext());
                 }
                 cusVisit.setSignTypeFormValue(param.getFormJson());
+                cusVisit.setStatus(1);
                 bizVisitService.updateById(cusVisit);
                 return;
             }

src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java

@@ -6,10 +6,13 @@ 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.AuthContextUtils;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.modules.biz.entity.BizCusVisit;
 import com.qs.serve.modules.biz.entity.BizVisit;
 import com.qs.serve.modules.biz.service.BizVisitService;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.service.SysUserSalesService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.wx.entity.WxUser;
 import com.qs.serve.modules.wx.service.WxUserService;
@@ -35,6 +38,7 @@ public class BizVisitApi {
     private BizVisitService bizVisitService;
     private WxUserService wxUserService;
     private SysUserService sysUserService;
+    private SysUserSalesService sysUserSalesService;
 
     /**
      * 翻页
@@ -55,6 +59,24 @@ public class BizVisitApi {
         return R.byPageHelperList(list);
     }
 
+    /**
+     * 翻页（我的下属拜访记录）
+     * @param param
+     * @return
+     */
+    @GetMapping("/page4Under")
+    public R<PageVo<BizVisit>> page4Under(BizVisit param){
+        List<String> userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId());
+        if(userIds.size()<1){
+            return R.byEmptyList();
+        }
+        PageUtil.startPage();
+        LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
+        visitWrapper.in(BizVisit::getVisitorId,userIds);
+        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        return R.byPageHelperList(list);
+    }
+
     /**
      * ID查询
      * @param id

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

@@ -55,7 +55,7 @@ public class BmsSubjectController {
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:subject:query')")
     public R<List<BmsSubjectTreeVo>> getPage(String supplierId){
-        List<BmsSubject> subjectList = bmsSubjectService.list(new LambdaQueryWrapper<BmsSubject>().orderByDesc(BmsSubject::getId));
+        List<BmsSubject> subjectList = bmsSubjectService.list(new LambdaQueryWrapper<BmsSubject>().orderByAsc(BmsSubject::getSubjectCode));
         List<BmsSubjectTreeVo> treeVoList = subjectList.stream().map(subject->{
             BmsSubjectTreeVo treeNode = CopierUtil.copy(subject,new BmsSubjectTreeVo());
             treeNode.setId(subject.getId().toString());

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

@@ -24,6 +24,7 @@ import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2;
 import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -113,8 +114,11 @@ public class BmsSupplierController {
     @GetMapping("/tree")
     @PreAuthorize("hasRole('bms:supplier:query')")
     public R<List<BmsSupplierTreeVo>> getTree(BmsSupplier param){
+        Date d = new Date();
         List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
+        Date d2 = new Date();
         initSupplierList(list);
+        Date d3 = new Date();
         List<BmsSupplierTreeVo> list2 = list.stream().map(supplier->{
             BmsSupplierTreeVo treeNode = CopierUtil.copy(supplier,new BmsSupplierTreeVo());
             treeNode.setId(supplier.getId());
@@ -122,7 +126,13 @@ public class BmsSupplierController {
             treeNode.setSort(0);
             return treeNode;
         }).collect(Collectors.toList());
+        Date d4 = new Date();
         list2 = TreeUtil.buildByRecursive(list2,TreeUtil.DEFAULT_PID_STRING);
+        Date d5 = new Date();
+        System.out.println("d2-d"+(d2.getTime()-d.getTime()));
+        System.out.println("d3-d2"+(d3.getTime()-d2.getTime()));
+        System.out.println("d4-d3"+(d4.getTime()-d3.getTime()));
+        System.out.println("d5-d4"+(d5.getTime()-d4.getTime()));
         return R.ok(list2);
     }
 

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

@@ -92,7 +92,7 @@ public class BmsSupplierVisitAddressController {
                         addressVo.setSupplierCode(supplier.getCode());
                         addressVo.setSupplierName(supplier.getName());
                         BmsSupplierVisitAddress visitAddress = bmsSupplierVisitAddressService.getById(addressVo.getAddressId());
-                        BmsSupplierVisit visitInfo = bmsSupplierVisitService.getById(supplier.getId());
+                        BmsSupplierVisit visitInfo = bmsSupplierVisitService.getOne(new LambdaQueryWrapper<BmsSupplierVisit>().eq(BmsSupplierVisit::getSupplierId,supplier.getId()),false);
                         addressVo.setAddressInfo(visitAddress);
                         addressVo.setVisitInfo(visitInfo);
                         break;

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

@@ -85,8 +85,10 @@ public class GoodsCategoryController {
      * @return
      */
     @GetMapping("/enableTree")
-    public R<List<GoodsCategoryTreeVo>> getPage(GoodsCategory param){
+    public R<List<GoodsCategoryTreeVo>> getPage(GoodsCategory param,Integer loadAll){
+        if(loadAll==null||!loadAll.equals(1)){
             param.setEnable(1);
+        }
         return this.getTree(param);
     }
 

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@@ -111,6 +111,7 @@ public class TzcPolicyController {
         LambdaQueryWrapper<TzcPolicy> lqw = new LambdaQueryWrapper<>(param);
         param.setUserId(userId);
         PageUtil.startPage();
+        lqw.orderByDesc(TzcPolicy::getCreateTime);
         List<TzcPolicy> list = tzcPolicyService.list(lqw);
         return R.byPageHelperList(list);
     }
@@ -125,6 +126,7 @@ public class TzcPolicyController {
     public R<PageVo<TzcPolicy>> getPage(TzcPolicy param){
         LambdaQueryWrapper<TzcPolicy> lqw = new LambdaQueryWrapper<>(param);
         PageUtil.startPage();
+        lqw.orderByDesc(TzcPolicy::getCreateTime);
         List<TzcPolicy> list = tzcPolicyService.list(lqw);
         return R.byPageHelperList(list);
     }
@@ -188,7 +190,10 @@ public class TzcPolicyController {
         lqw.in(TzcPolicy::getId,idsLong);
         lqw.eq(TzcPolicy::getPolicyStatus, TzcPolicyStatus.Status_0_UnCommit);
         boolean result = tzcPolicyService.remove(lqw);
-        return R.isTrue(result);
+        if(result){
+            return R.ok();
+        }
+        return R.error("当前状态不支持删除");
     }
 
 

src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java

@@ -12,6 +12,8 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
@@ -58,13 +60,17 @@ public class TzcPolicyItemBo implements Serializable {
 
     /** 满减金额 */
     @NotNull(message = "满减金额不能为空")
+    @DecimalMin(value = "1",message = "返点百分比参数错误")
     private BigDecimal discountAmount;
 
     /** 优惠上限 */
+    @DecimalMin(value = "1",message = "返点百分比参数错误")
     private BigDecimal discountMax;
 
     /** 返点百分比 */
     @NotNull(message = "返点百分比不能为空")
+    @DecimalMax(value = "100",message = "返点百分比参数错误")
+    @DecimalMin(value = "0.01",message = "返点百分比参数错误")
     private BigDecimal discountRate;
 
 

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -166,7 +166,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         createProcess.setDataJson(JsonUtil.objectToJson(data));
         R<String> flowIdResult = seeYonService.baseCreateProcess(createProcess);
         if(flowIdResult.getStatus()!=200){
-            Assert.throwEx("远程服务调用失败");
+            Assert.throwEx(flowIdResult.getMsg());
         }
         String flowId = flowIdResult.getData();
         String formId = null;
@@ -324,6 +324,9 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
                                                      Boolean buildTableFlag){
         Boolean overspend = false;
         List<TzcPolicyItem> policyItemList = tzcPolicyItemService.listByPolicyId(policyId);
+        if(policyItemList.size()<1){
+            Assert.throwEx("请政策项添加后再提交");
+        }
         return this.buildBudgetCostResult(policyId,policyItemList,overspend,throwEx,buildTableFlag);
     }
 
@@ -387,6 +390,11 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByPolicyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),policyId);
             //因为结果为负数，需去相反数
             budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate();
+            //添加费用占用情况
+            BigDecimal budgetItemCostAmount = tbsScheduleItemBudgetMapper.totalCostAmountByApplyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),0L);
+            if(budgetItemCostAmount!=null){
+                budgetItemAmount = budgetItemAmount.add(budgetItemCostAmount.negate());
+            }
             budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount);
         }
         //统计当前活动前置项占用预算