政策查询调整

src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java

@@ -45,7 +45,6 @@ public class UnifiedExceptionHandler {
     @ExceptionHandler(value = NullPointerException.class)
     @ResponseBody
     public R handleBindException(NullPointerException e,HttpServletRequest request) {
-        e.printStackTrace();
         log.error("空指针【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
         e.printStackTrace();
         return R.error("数据不存在或被移除");

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -86,6 +86,7 @@ public class TbsCostApplyController {
     private TbsScheduleItemBudgetService tbsScheduleItemBudgetService;
     private SysDeleteLogService deleteLogService;
     private TbsCostApplyMapper tbsCostApplyMapper;
+    private TbsCostChangeInfoService tbsCostChangeInfoService;
 
 
     /**
@@ -226,6 +227,13 @@ public class TbsCostApplyController {
                 e.printStackTrace();
             }
         }
+        if(tbsCostApply.getChargeState().equals(TbsCostApplyState.State_7_changed.getCode())){
+            try {
+                tbsCostChangeInfoService.compareToBuildChangeInfo(tbsCostApply.getId(),tbsCostApply.getChangeExtendId());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         TbsCostContract contract = costContractService.getByCostApplyId(tbsCostApply.getId());
         tbsCostApply.setContractInfo(contract);
         return R.ok(tbsCostApply);
@@ -341,6 +349,11 @@ public class TbsCostApplyController {
         lqw.eq(TbsCostApply::getCode,costApply.getCode());
         lqw.orderByAsc(TbsCostApply::getCreateTime);
         List<TbsCostApply> costApplyList = tbsCostApplyService.list(lqw);
+        for (TbsCostApply apply : costApplyList) {
+            tbsCostChangeInfoService.compareToBuildChangeInfo(apply.getChangeSourceId(),apply.getChangeExtendId());
+            List<TbsCostChangeInfo> changeInfoList = tbsCostChangeInfoService.listByExtendCostApplyId(apply.getId());
+            apply.setChangeInfoLogs(changeInfoList);
+        }
         return R.ok(costApplyList);
     }
 

src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java

@@ -269,5 +269,10 @@ public class TbsCostApply implements Serializable {
     List<String> selectUserIds;
 
 
+    /**
+     * 异动修改日志
+     */
+    @TableField(exist = false)
+    List<?> changeInfoLogs;
 }
 

src/main/java/com/qs/serve/modules/tbs/service/TbsActivityChannelPointService.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.tbs.entity.TbsActivityChannelPoint;
+import java.util.List;
 
 /**
  * 活动网点项 服务接口
@@ -10,5 +11,7 @@ import com.qs.serve.modules.tbs.entity.TbsActivityChannelPoint;
  */
 public interface TbsActivityChannelPointService extends IService<TbsActivityChannelPoint> {
 
+    List<TbsActivityChannelPoint> listByActivityId(Long activityId);
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/TbsCostChangeInfoService.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.tbs.entity.TbsCostChangeInfo;
+import java.util.List;
 
 /**
  * 异动信息 服务接口
@@ -12,5 +13,7 @@ public interface TbsCostChangeInfoService extends IService<TbsCostChangeInfo> {
 
     void compareToBuildChangeInfo(Long orgId,Long newId);
 
+    List<TbsCostChangeInfo> listByExtendCostApplyId(Long newId);
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityChannelPointServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.tbs.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -8,6 +9,8 @@ import com.qs.serve.modules.tbs.entity.TbsActivityChannelPoint;
 import com.qs.serve.modules.tbs.service.TbsActivityChannelPointService;
 import com.qs.serve.modules.tbs.mapper.TbsActivityChannelPointMapper;
 
+import java.util.List;
+
 /**
  * 活动网点项 服务实现类
  * @author YenHex
@@ -18,5 +21,12 @@ import com.qs.serve.modules.tbs.mapper.TbsActivityChannelPointMapper;
 @AllArgsConstructor
 public class TbsActivityChannelPointServiceImpl extends ServiceImpl<TbsActivityChannelPointMapper,TbsActivityChannelPoint> implements TbsActivityChannelPointService {
 
+    @Override
+    public List<TbsActivityChannelPoint> listByActivityId(Long activityId) {
+        LambdaQueryWrapper<TbsActivityChannelPoint> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(TbsActivityChannelPoint::getActivityId,activityId);
+        return this.list(lqw);
+    }
+
 }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostChangeInfoServiceImpl.java

@@ -60,9 +60,27 @@ public class TbsCostChangeInfoServiceImpl extends ServiceImpl<TbsCostChangeInfoM
     private TbsActivitySubjectService activitySubjectService;
     private TbsActivityCenterService activityCenterService;
     private TbsActivityChannelService activityChannelService;
+    private TbsActivityChannelPointService activityChannelPointService;
+
+    @Override
+    public List<TbsCostChangeInfo> listByExtendCostApplyId(Long newId) {
+        LambdaQueryWrapper<TbsCostChangeInfo> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(TbsCostChangeInfo::getExtendId,newId);
+        return this.list(lqw);
+    }
 
     @Override
     public void compareToBuildChangeInfo(Long orgId, Long newId) {
+        if (orgId==null||newId==null){
+            return;
+        }
+        LambdaQueryWrapper<TbsCostChangeInfo> checkBuild = new LambdaQueryWrapper<>();
+        checkBuild.eq(TbsCostChangeInfo::getSourceId,orgId);
+        checkBuild.eq(TbsCostChangeInfo::getExtendId,newId);
+        Long count = this.count(checkBuild);
+        if(count>0){
+            return;
+        }
         List<TbsCostChangeInfo> changeInfoList = new ArrayList<>();
         TbsCostApply oldApply = costApplyService.getById(orgId);
         TbsCostApply newApply = costApplyService.getById(newId);
@@ -122,11 +140,48 @@ public class TbsCostChangeInfoServiceImpl extends ServiceImpl<TbsCostChangeInfoM
                 changeInfoList.add(TbsCostChangeInfo.toNewObject("新增活动","["+newAct.getActivityCode()+"]"+newAct.getActTitle()));
             }
         }
-
+        for (TbsCostChangeInfo changeInfo : changeInfoList) {
+            changeInfo.setSourceId(orgId);
+            changeInfo.setExtendId(newId);
+        }
+        this.saveBatch(changeInfoList);
     }
 
     private void buildPointByActs(TbsActivity orgAct, TbsActivity newAct,List<TbsCostChangeInfo> changeInfoList ) {
-
+        List<TbsActivityChannelPoint> orgPointList = activityChannelPointService.listByActivityId(orgAct.getId());
+        List<TbsActivityChannelPoint> newPointList = activityChannelPointService.listByActivityId(newAct.getId());
+        boolean hasChannel = orgPointList.size()>0||newPointList.size()>0;
+        if(hasChannel){
+            for (TbsActivityChannelPoint oldChannel : orgPointList) {
+                boolean matchOld = false;
+                for (TbsActivityChannelPoint newChannel : newPointList) {
+                    if(oldChannel.getPointId().equals(newChannel.getPointId())){
+                        matchOld = true;
+                        if(oldChannel.getPointRate().compareTo(newChannel.getPointRate())!=0) {
+                            changeInfoList.add(TbsCostChangeInfo.toNewObject("活动["+orgAct.getActivityCode()+"]网点更变",
+                                    "原费用占比："+oldChannel.getPointRate()+"%"
+                                            +"; 异动后占比："+newChannel.getPointRate()+"%"));
+                        }
+                    }
+                }
+                if(!matchOld){
+                    changeInfoList.add(TbsCostChangeInfo.toNewObject("活动["+orgAct.getActivityCode()+"]网点删除",
+                            oldChannel.getPointCode()+"/"+oldChannel.getPointName()));
+                }
+            }
+            for (TbsActivityChannelPoint newChannel : newPointList) {
+                boolean matchNew = false;
+                for (TbsActivityChannelPoint oldChannel : orgPointList) {
+                    if(oldChannel.getPointId().equals(newChannel.getPointId())){
+                        matchNew = true;
+                    }
+                }
+                if(!matchNew){
+                    changeInfoList.add(TbsCostChangeInfo.toNewObject("活动["+orgAct.getActivityCode()+"]网点新增",
+                            newChannel.getPointCode()+"/"+newChannel.getPointName()));
+                }
+            }
+        }
     }
 
     private void buildChannelByActs(TbsActivity orgAct, TbsActivity newAct,List<TbsCostChangeInfo> changeInfoList ) {
@@ -144,7 +199,7 @@ public class TbsCostChangeInfoServiceImpl extends ServiceImpl<TbsCostChangeInfoM
                         ){
                             changeInfoList.add(TbsCostChangeInfo.toNewObject("活动["+orgAct.getActivityCode()+"]渠道更变",
                                     "原费用占比："+oldChannel.getChannelRate()+"% 投放网点数量： "+oldChannel.getPreCountPoint()
-                                            +"; 原费用占比："+newChannel.getChannelRate()+"% 投放网点数量： "+newChannel.getPreCountPoint()));
+                                            +"; 异动后占比："+newChannel.getChannelRate()+"% 投放网点数量： "+newChannel.getPreCountPoint()));
                         }
                     }
                 }

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

@@ -59,6 +59,7 @@ public class PortalOfCostController {
         } catch (Exception e) {
             log.error("站式创建费用(费用申请)===>{}", JsonUtil.objectToJson(createBo));
             syncLog.setFailReason(e.getMessage());
+            sysSyncLogService.save(syncLog);
             return R.error(e.getMessage());
         }
         sysSyncLogService.save(syncLog);
@@ -88,6 +89,7 @@ public class PortalOfCostController {
         } catch (Exception e) {
             log.error("协议类核销支付(费用申请)===>{}", JsonUtil.objectToJson(createBo));
             syncLog.setFailReason(e.getMessage());
+            sysSyncLogService.save(syncLog);
             return R.error(e.getMessage());
         }
         sysSyncLogService.save(syncLog);
@@ -116,6 +118,7 @@ public class PortalOfCostController {
         } catch (Exception e) {
             log.error("协议类核销支付(费用申请)===>{}", JsonUtil.objectToJson(contractBo));
             syncLog.setFailReason(e.getMessage());
+            sysSyncLogService.save(syncLog);
             return R.error(e.getMessage());
         }
         sysSyncLogService.save(syncLog);
@@ -146,6 +149,7 @@ public class PortalOfCostController {
         } catch (Exception e) {
             log.error("站式创建费用(费用申请)===>{}", JsonUtil.objectToJson(createBo));
             syncLog.setFailReason(e.getMessage());
+            sysSyncLogService.save(syncLog);
             return R.error(e.getMessage());
         }
         sysSyncLogService.save(syncLog);

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

@@ -128,11 +128,9 @@ public class TzcPolicyController {
     @GetMapping("/pageMy")
     public R<PageVo<TzcPolicy>> getPageMy(TzcPolicy param){
         String userId = AuthContextUtils.getSysUserId();
-        LambdaQueryWrapper<TzcPolicy> lqw = new LambdaQueryWrapper<>(param);
         param.setUserId(userId);
         PageUtil.startPage();
-        lqw.orderByDesc(TzcPolicy::getCreateTime);
+        List<TzcPolicy> list = tzcPolicyService.selectPolicyList(param);
-        List<TzcPolicy> list = tzcPolicyService.list(lqw);
         return R.byPageHelperList(list);
     }
 
@@ -146,11 +144,9 @@ public class TzcPolicyController {
         String userId = AuthContextUtils.getSysUserId();
         List<String> userIds = postUserService.listByChildIds(userId);
         userIds.add(userId);
-        LambdaQueryWrapper<TzcPolicy> lqw = new LambdaQueryWrapper<>(param);
+        param.setChildUserIds(userIds);
         PageUtil.startPage();
-        lqw.in(TzcPolicy::getUserId,userIds);
+        List<TzcPolicy> list = tzcPolicyService.selectPolicyList(param);
-        lqw.orderByDesc(TzcPolicy::getCreateTime);
-        List<TzcPolicy> list = tzcPolicyService.list(lqw);
         return R.byPageHelperList(list);
     }
 
@@ -162,10 +158,8 @@ public class TzcPolicyController {
     @GetMapping("/page")
     @PreAuthorize("hasRole('tzc:policy:query')")
     public R<PageVo<TzcPolicy>> getPage(TzcPolicy param){
-        LambdaQueryWrapper<TzcPolicy> lqw = new LambdaQueryWrapper<>(param);
         PageUtil.startPage();
-        lqw.orderByDesc(TzcPolicy::getCreateTime);
+        List<TzcPolicy> list = tzcPolicyService.selectPolicyList(param);
-        List<TzcPolicy> list = tzcPolicyService.list(lqw);
         return R.byPageHelperList(list);
     }
 

src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java

@@ -148,6 +148,13 @@ public class TzcPolicy implements Serializable {
     private String extUserCode;
     private String extUserName;
 
+
+    /**
+     * 下属ID
+     */
+    @TableField(exist = false)
+    List<String> childUserIds;
+
     @TableField(exist = false)
     List<?> policyItemList;
 

src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.tzc.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tzc.entity.TzcPolicy;
@@ -15,6 +16,14 @@ import java.util.List;
  */
 public interface TzcPolicyMapper extends BaseMapper<TzcPolicy> {
 
+    /**
+     * 查询政策
+     * @param param
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    List<TzcPolicy> selectTzcPolicyList(@Param("query")TzcPolicy param);
+
     /**
      * 设置数据的继承人
      * @param policyIds

src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.modules.tzc.entity.TzcPolicy;
 import com.qs.serve.modules.tzc.entity.bo.TzcPolicyBo;
+import java.util.List;
 
 /**
  * 政策 服务接口
@@ -12,6 +13,8 @@ import com.qs.serve.modules.tzc.entity.bo.TzcPolicyBo;
  */
 public interface TzcPolicyService extends IService<TzcPolicy> {
 
+    List<TzcPolicy> selectPolicyList(TzcPolicy tzcPolicy);
+
     R<?> modify(TzcPolicyBo policyParam);
 
 

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

@@ -26,6 +26,8 @@ import com.qs.serve.modules.tzc.service.TzcPolicyService;
 import com.qs.serve.modules.tzc.mapper.TzcPolicyMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 政策 服务实现类
  * @author YenHex
@@ -40,6 +42,11 @@ public class TzcPolicyServiceImpl extends ServiceImpl<TzcPolicyMapper,TzcPolicy>
     private SysUserService sysUserService;
     private TbsBudgetCostItemPolicyService tbsBudgetCostItemPolicyService;
 
+    @Override
+    public List<TzcPolicy> selectPolicyList(TzcPolicy tzcPolicy) {
+        return baseMapper.selectTzcPolicyList(tzcPolicy);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> modify(TzcPolicyBo policyParam) {

src/main/resources/mapper/tzc/TzcPolicyMapper.xml

@@ -4,6 +4,105 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qs.serve.modules.tzc.mapper.TzcPolicyMapper">
 
+    <resultMap id="tzcPolicyMap" type="com.qs.serve.modules.tzc.entity.TzcPolicy" >
+        <result property="id"  column="id"/>
+        <result property="title"  column="title"/>
+        <result property="policyCode"  column="policy_code"/>
+        <result property="policyStatus"  column="policy_status"/>
+        <result property="passTime"  column="pass_time"/>
+        <result property="submitTime"  column="submit_time"/>
+        <result property="totalItems"  column="total_items"/>
+        <result property="totalItemAmount"  column="total_item_amount"/>
+        <result property="totalItemUsedAmount"  column="total_item_used_amount"/>
+        <result property="supplierId"  column="supplier_id"/>
+        <result property="supplierCode"  column="supplier_code"/>
+        <result property="supplierName"  column="supplier_name"/>
+        <result property="userId"  column="user_id"/>
+        <result property="userCode"  column="user_code"/>
+        <result property="userName"  column="user_name"/>
+        <result property="syFlowId"  column="sy_flow_id"/>
+        <result property="syFormId"  column="sy_form_id"/>
+        <result property="remark"  column="remark"/>
+        <result property="createTime"  column="create_time"/>
+        <result property="updateTime"  column="update_time"/>
+        <result property="tenantId"  column="tenant_id"/>
+        <result property="createBy"  column="create_by"/>
+        <result property="updateBy"  column="update_by"/>
+        <result property="delFlag"  column="del_flag"/>
+        <result property="extUserId"  column="ext_user_id"/>
+        <result property="extUserCode"  column="ext_user_code"/>
+        <result property="extUserName"  column="ext_user_name"/>
+    </resultMap>
+
+    <sql id="tzcPolicySql">
+        tzc_policy.`id`,
+        tzc_policy.`title`,
+        tzc_policy.`policy_code`,
+        tzc_policy.`policy_status`,
+        tzc_policy.`pass_time`,
+        tzc_policy.`submit_time`,
+        tzc_policy.`total_items`,
+        tzc_policy.`total_item_amount`,
+        tzc_policy.`total_item_used_amount`,
+        tzc_policy.`supplier_id`,
+        tzc_policy.`supplier_code`,
+        tzc_policy.`supplier_name`,
+        tzc_policy.`user_id`,
+        tzc_policy.`user_code`,
+        tzc_policy.`user_name`,
+        tzc_policy.`sy_flow_id`,
+        tzc_policy.`sy_form_id`,
+        tzc_policy.`remark`,
+        tzc_policy.`create_time`,
+        tzc_policy.`update_time`,
+        tzc_policy.`tenant_id`,
+        tzc_policy.`create_by`,
+        tzc_policy.`update_by`,
+        tzc_policy.`del_flag`,
+        tzc_policy.`ext_user_id`,
+        tzc_policy.`ext_user_code`,
+        tzc_policy.`ext_user_name`    </sql>
+
+    <select id="selectTzcPolicyList" parameterType="com.qs.serve.modules.tzc.entity.TzcPolicy" resultMap="tzcPolicyMap">
+        SELECT
+        <include refid="tzcPolicySql"/>
+        FROM `tzc_policy` `tzc_policy`
+        left join bms_supplier on tzc_policy.supplier_id = bms_supplier.id
+        <where>
+            <if test="query.id != null"> and `tzc_policy`.`id` = #{query.id}</if>
+            <if test="query.title != null and query.title != ''"> and `tzc_policy`.`title` like concat('%',#{query.title},'%') </if>
+            <if test="query.policyCode != null and query.policyCode != ''"> and `tzc_policy`.`policy_code` like concat('%',#{query.policyCode},'%') </if>
+            <if test="query.policyStatus != null"> and `tzc_policy`.`policy_status` = #{query.policyStatus}</if>
+            <if test="query.passTime != null"> and `tzc_policy`.`pass_time` = #{query.passTime}</if>
+            <if test="query.submitTime != null"> and `tzc_policy`.`submit_time` = #{query.submitTime}</if>
+            <if test="query.totalItems != null"> and `tzc_policy`.`total_items` = #{query.totalItems}</if>
+            <if test="query.totalItemAmount != null"> and `tzc_policy`.`total_item_amount` = #{query.totalItemAmount}</if>
+            <if test="query.totalItemUsedAmount != null"> and `tzc_policy`.`total_item_used_amount` = #{query.totalItemUsedAmount}</if>
+            <if test="query.supplierId != null"> and `tzc_policy`.`supplier_id` = #{query.supplierId}</if>
+            <if test="query.supplierCode != null and query.supplierCode != ''"> and `tzc_policy`.`supplier_code` like concat('%',#{query.supplierCode},'%') </if>
+            <if test="query.supplierName != null and query.supplierName != ''"> and `tzc_policy`.`supplier_name` like concat('%',#{query.supplierName},'%') </if>
+            <if test="query.userId != null and query.userId != ''"> and `tzc_policy`.`user_id` = #{query.userId}</if>
+            <if test="query.userCode != null and query.userCode != ''"> and `tzc_policy`.`user_code` like concat('%',#{query.userCode},'%')</if>
+            <if test="query.userName != null and query.userName != ''"> and `tzc_policy`.`user_name` like concat('%',#{query.userName},'%') </if>
+            <if test="query.syFlowId != null and query.syFlowId != ''"> and `tzc_policy`.`sy_flow_id` = #{query.syFlowId}</if>
+            <if test="query.syFormId != null and query.syFormId != ''"> and `tzc_policy`.`sy_form_id` = #{query.syFormId}</if>
+            <if test="query.remark != null and query.remark != ''"> and `tzc_policy`.`remark` = #{query.remark}</if>
+            <if test="query.createTime != null"> and `tzc_policy`.`create_time` = #{query.createTime}</if>
+            <if test="query.updateTime != null"> and `tzc_policy`.`update_time` = #{query.updateTime}</if>
+            <if test="query.extUserId != null and query.extUserId != ''"> and `tzc_policy`.`ext_user_id` = #{query.extUserId}</if>
+            <if test="query.extUserCode != null and query.extUserCode != ''"> and `tzc_policy`.`ext_user_code` = #{query.extUserCode}</if>
+            <if test="query.extUserName != null and query.extUserName != ''"> and `tzc_policy`.`ext_user_name` = #{query.extUserName}</if>
+
+            <if test="query.childUserIds!=null and query.childUserIds.size > 0">
+                and `tzc_policy`.`user_id` in
+                <foreach collection="query.childUserIds" item="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
+
+        </where>
+        order by create_time desc
+    </select>
 
     <update id="updateCostExtUserByPolicyIds">
         update tzc_policy