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

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -203,4 +203,10 @@ public class SysAmountAuditingEntity implements Serializable {
      */
     @TableField(value = "account_id")
     private String accountId;
+
+    /***
+     *  机构来源
+     */
+    @TableField(exist = false)
+    private String source;
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -154,4 +154,7 @@ public class SysAmountAuditingVo {
 
     @ApiModelProperty("用户idList")
     private List<String> userIdList;
+
+    @ApiModelProperty("业务来源")
+    private String  source;
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -340,7 +340,10 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, sysAgencyLeaderVo.getDeptId()).eq(SysDept::getDelFlag, 0));
                 if (sysDept != null) {
                     sysAgencyLeaderVo.setParentId(sysDept.getParentId());
+                    sysAgencyLeaderVo.setDeptName(sysDept.getName());
                 }
+                SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaderVo.getUserId());
+                sysAgencyLeaderVo.setUserName(sysUser.getName());
             }
         }
 
@@ -354,7 +357,12 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         sysAgencyLeader.setId(id);
         SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeader);
         SysAgencyLeaderVo sysAgencyLeaderVo = BeanUtil.copyProperties(sysAgencyLeader1, SysAgencyLeaderVo.class);
-
+        SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaderVo.getUserId());
+        sysAgencyLeaderVo.setUserName(sysUser.getName());
+        SysUser sysUser1 = sysUserMapper.selectById(sysAgencyLeaderVo.getSuggestId());
+        if (sysUser1 != null) {
+            sysAgencyLeaderVo.setSuggestName(sysUser1.getName());
+        }
         return sysAgencyLeaderVo;
     }
 
@@ -686,11 +694,12 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 BigDecimal bigDecimal = BigDecimal.ZERO;
                 //已提现抽成费用
                 BigDecimal historyFee = BigDecimal.ZERO;
-
+                SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaders.getUserId());
+                SysDept sysDept = sysDeptMapper.selectById(sysAgencyLeaders.getDeptId());
                 agencyExtractFee.setUserId(sysAgencyLeaders.getUserId());
-                agencyExtractFee.setUserName(sysAgencyLeaders.getUserName());
+                agencyExtractFee.setUserName(sysUser.getName());
                 agencyExtractFee.setDeptId(sysAgencyLeaders.getDeptId());
-                agencyExtractFee.setDeptName(sysAgencyLeaders.getDeptName());
+                agencyExtractFee.setDeptName(sysDept.getName());
                 agencyExtractFee.setProportional(sysAgencyLeaders.getProportional());
                 //筛选订单，选择时间
                 Date updateTime = sysAgencyLeaders.getUpdateTime();

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -189,6 +189,9 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             if(StringUtils.isNotEmpty(sysAmountAuditingVo.getEndAuditingTime())){
                 params.put("endAuditingTime",sysAmountAuditingVo.getEndAuditingTime());
             }
+            if(StringUtils.isNotBlank(sysAmountAuditingVo.getSource())){
+                params.put("source",sysAmountAuditingVo.getSource());
+            }
 
             List<SysAmountAuditingEntity> list = baseMapper.queryPageOrderNew(params);
             pageHelper=new PageInfo(list);

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -77,8 +77,16 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
     @Override
     public List<SysPartner> queryRecommendAndPartner(String id) {
-        return sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
+        List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
                 .likeRight(SysPartner::getUserId, id).orderByDesc(SysPartner::getId));
+        if (sysPartnerList.size()>0) {
+            for (SysPartner sysPartner : sysPartnerList) {
+                SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
+                sysPartner.setUserName(sysUser.getName());
+            }
+
+        }
+        return sysPartnerList;
     }
 
     @Override
@@ -125,7 +133,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 if (sysPartner != null) {
                     user.setType("1");
                     user.setSuggestId(sysPartner.getSuggestId());
-                    user.setSuggestName(sysPartner.getSuggestName());
+                    SysUser sysUser = sysUserMapper.selectById(sysPartner.getSuggestId());
+                    if (sysUser != null) {
+                        user.setSuggestName(sysUser.getName());
+                    }
                     user.setProportional(sysPartner.getProportional());
                 }
             }
@@ -388,10 +399,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 //填充查询人的姓名和机构
                 agencyExtractFee.setProportional(sysPartner.getProportional());
                 agencyExtractFee.setUserId(sysPartner.getUserId());
-                agencyExtractFee.setUserName(sysPartner.getUserName());
                 SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
                         .eq(SysUser::getId, sysPartner.getUserId())
                         .eq(SysUser::getStatus, 1));
+                agencyExtractFee.setUserName(sysUser.getName());
                 agencyExtractFee.setDeptId(sysUser.getDeptId());
                 SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
                         .eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -602,10 +602,9 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         pageVo.setPageNum(taskStatisticsVo.getPageNum());
         pageVo.setPageSize(taskStatisticsVo.getPageSize());
 
-
-        HashMap<String, String> dateMapByType = getDateMapByType(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
-        taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
-        taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
+        HashMap<String, String> dateMapByType = getDateMapByType(taskStatisticsVo.getDateType(), taskStatisticsVo.getBeginDate(), taskStatisticsVo.getEndDate());
+        taskStatisticsVo.setBeginDate(dateMapByType.get("startDate"));
+        taskStatisticsVo.setEndDate(dateMapByType.get("endDate"));
         IPage<TaskStatisticsDto> list = this.taskStatisticsMapper.channelAgentDetails(page,taskStatisticsVo);
         return list;
     }

src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -1,5 +1,7 @@
 package com.ydtech.modules.fnc.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
@@ -13,14 +15,17 @@ import com.ydtech.modules.fnc.entity.InsFeeAuditHistory;
 import com.ydtech.modules.fnc.entity.vo.ProblemOrderQueryVo;
 import com.ydtech.modules.fnc.service.InsFeeAuditHistoryService;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
+import com.ydtech.modules.order.constants.OrderFeeAuditHistroy;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.InsOrdersTrack;
 import com.ydtech.modules.order.entity.vo.AuditOrderFeeVo;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.order.service.InsOrdersTrackService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -42,15 +47,18 @@ public class CarSettleController extends BaseController {
 
     private final InsFeeAuditHistoryService insFeeAuditHistoryService;
 
+    private final InsOrdersTrackService insOrdersTrackService;
+
 
     public CarSettleController(InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService,
                                InsFeeAuditService insFeeAuditService,
-                               InsFeeAuditHistoryService insFeeAuditHistoryService) {
+                               InsFeeAuditHistoryService insFeeAuditHistoryService,InsOrdersTrackService insOrdersTrackService) {
 
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insFeeAuditService = insFeeAuditService;
         this.insFeeAuditHistoryService = insFeeAuditHistoryService;
+        this.insOrdersTrackService = insOrdersTrackService;
 
     }
 
@@ -144,24 +152,37 @@ public class CarSettleController extends BaseController {
 
     @GetMapping("/getFeeAuditHistory/{orderno}")
     @ApiOperation(value = "获取费用审核轨迹")
-    public HttpResult<List<InsFeeAuditHistory>> getFeeAuditHistory(@PathVariable("orderno") String orderno) {
+    public HttpResult getFeeAuditHistory(@PathVariable("orderno") String orderno) {
         InsAreaCompany underWrittenSubOrder = insAreaCompanyService.getById(orderno);
         if (underWrittenSubOrder == null) {
             return HttpResult.error("订单号有误-未承保");
         }
-        List<InsFeeAuditHistory> list = new ArrayList<>();
-        InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory();
-        insFeeAuditHistory.setOrderno(underWrittenSubOrder.getOrderno());
-        insFeeAuditHistory.setInsOrderNo(underWrittenSubOrder.getId());
-        insFeeAuditHistory.setInsCompany(underWrittenSubOrder.getInscompany());
-        insFeeAuditHistory.setOperator(underWrittenSubOrder.getUserName());
-        insFeeAuditHistory.setOperatorTime(underWrittenSubOrder.getSigningTime());
-        insFeeAuditHistory.setAuditstatus(FeeAuditAuditstatus.UNDERWRITING.getCode());
-        list.add(insFeeAuditHistory);
+        JSONArray list = new JSONArray();
+        List<InsOrdersTrack> insOrdersTracks = insOrdersTrackService.list(new LambdaQueryWrapper<InsOrdersTrack>().eq(InsOrdersTrack::getSuborder, orderno)
+                .orderByAsc(InsOrdersTrack::getCreateTime));
+        insOrdersTracks.forEach(item->{
+            String desc = OrderFeeAuditHistroy.getDesc(item.getOrderStatus());
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("insCompany",item.getInsCompany());
+            jsonObject.put("operatorTime",item.getCreateTime());
+            jsonObject.put("audituser",item.getOperatorId());
+            jsonObject.put("operator",item.getOperator());
+            jsonObject.put("desc",desc);
+            list.add(jsonObject);
+        });
+
         LambdaQueryWrapper<InsFeeAuditHistory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InsFeeAuditHistory::getInsOrderNo, orderno);
         wrapper.orderByAsc(InsFeeAuditHistory::getOperatorTime);
-        list.addAll(insFeeAuditHistoryService.list(wrapper));
+        List<InsFeeAuditHistory> insFeeAuditHistories = insFeeAuditHistoryService.list(wrapper);
+        insFeeAuditHistories.forEach(item->{
+            String desc = OrderFeeAuditHistroy.getDesc(OrderFeeAuditHistroy.convertStatus(item.getAuditstatus()));
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(item));
+            jsonObject.put("desc",desc);
+            list.add(jsonObject);
+        });
+
+
         return HttpResult.ok("success", list);
     }
 

src/main/java/com/ydtech/modules/order/constants/OrderFeeAuditHistroy.java

@@ -0,0 +1,55 @@
+package com.ydtech.modules.order.constants;
+
+public enum OrderFeeAuditHistroy {
+    OFH_0("0", "报价中"),
+    OFH_1("1", "待核保"),
+    OFH_2("2", "已核保代缴费"),
+    OFH_3("3", "已承保"),
+    OFH_4("4", "核保退回"),
+    OFH_5("5", "未审核"),
+    OFH_6("6", "已审核"),
+    OFH_7("7", "驳回"),
+    OFH_8("8", "电销未提交"),
+    OFH_9("9", "电销待提交");
+
+    private final String code;
+    private final String desc;
+
+    OrderFeeAuditHistroy(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDesc(){
+        return desc;
+    }
+
+    public static String getDesc(String code){
+        for( OrderFeeAuditHistroy audit : OrderFeeAuditHistroy.values()){
+            if(audit.getCode().equals(code)){
+                return audit.getDesc();
+            }
+        }
+        return "";
+    }
+
+    public static String convertStatus(String auditStatus){
+        if(auditStatus.equals("0")){
+            return OFH_5.getCode();
+        }else if(auditStatus.equals("1")){
+            return OFH_6.getCode();
+        }else if(auditStatus.equals("2")){
+            return OFH_7.getCode();
+        }else if(auditStatus.equals("4")){
+            return OFH_5.getCode();
+        }else if(auditStatus.equals("5")){
+            return OFH_6.getCode();
+        }
+        return "";
+    }
+
+}

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -133,7 +133,8 @@
         a.bank_card_num  as "bankCardNum",
         a.bank_name  as "bankName",
         a.bank_num  as "bankNum",
-        a.account_id as "accountId"
+        a.account_id as "accountId",
+        sd.management_source  AS source
         from sys_amount_auditing a
         left join sys_user_account_history b on a.id = b.auditiing_id
         left join sys_user su on su.id =a.user_id
@@ -173,6 +174,9 @@
             <if test="leaderId !=null  and leaderId != ''">
                 and su.leader_id=#{leaderId}
             </if>
+            <if test="source !=null  and source != ''">
+                and sd.management_source=#{source}
+            </if>
         </where>
         order by a.create_time desc
     </select>
@@ -267,6 +271,7 @@
         from sys_amount_auditing a
         left join sys_user_account_history b on a.id = b.auditiing_id
         left join sys_user su on su.id =a.user_id
+        left join sys_dept sd on sd.id =su.dept_id
         <where>
             <if test="vo.auditingStatus !=null  and vo.auditingStatus != ''">
                 a.auditing_status=#{vo.auditingStatus}
@@ -298,6 +303,9 @@
             <if test="vo.leaderId !=null  and vo.leaderId != ''">
                 and su.leader_id = #{vo.leaderId}
             </if>
+            <if test="vo.source !=null  and vo.source != ''">
+                and sd.management_source=#{source}
+            </if>
         </where>
     </select>
 </mapper>

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1040,6 +1040,9 @@
                     and dept.management_source=2
                 </when>
             </choose>
+            <if test="orderQueryVo.signStartDateStr != null and orderQueryVo.signEndDateStr != null">
+                and  DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{orderQueryVo.signStartDateStr} AND #{orderQueryVo.signEndDateStr}
+            </if>
         </where>
         order by io.createtime desc
     </select>
@@ -1175,6 +1178,9 @@
                     and dept.management_source=2
                 </when>
             </choose>
+            <if test="orderQueryVo.signStartDateStr != null and orderQueryVo.signEndDateStr != null">
+                and  DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{orderQueryVo.signStartDateStr} AND #{orderQueryVo.signEndDateStr}
+            </if>
         </where>
         ) as s
     </select>