Merge branch 'refs/heads/test' into test-fee

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -8,23 +8,26 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.code.kaptcha.Producer;
 import com.ydtech.config.MasterPasswordConfig;
+import com.ydtech.constants.SysConstants;
 import com.ydtech.constants.sys.SysPasswordEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysPassword;
 import com.ydtech.modules.admin.model.SysRole;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.po.SysUserLinkSys;
 import com.ydtech.modules.admin.model.vo.LoginBean;
 import com.ydtech.modules.admin.model.vo.LoginTicket;
 import com.ydtech.modules.admin.model.vo.PhoneLoginVo;
 import com.ydtech.modules.admin.model.vo.QrCodeStatusEnum;
 import com.ydtech.modules.admin.service.SysPasswordService;
-import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.utils.RedisUtils;
+import com.ydtech.modules.admin.service.SysUserLinkSysService;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.IPUtil;
+import com.ydtech.utils.RedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -78,6 +81,7 @@ public class SysLoginController {
 
     private final SysPasswordService sysPasswordService;
 
+    private final SysUserLinkSysService  sysUserLinkSysService;
     @GetMapping("captcha.jpg")
     @ApiOperation(value = "获取验证码", produces = "application/octet-stream")
     public void captcha(HttpServletResponse response, HttpServletRequest request) throws IOException {
@@ -141,6 +145,19 @@ public class SysLoginController {
 //
         // 用户信息
         SysUser user = sysUserService.getById(username);
+
+        /**
+         *  多个系统登录
+         * */
+        if(!SysConstants.ADMIN.equalsIgnoreCase(username) && !"1".equals(loginBean.getSysId())){
+            LambdaQueryWrapper<SysUserLinkSys> sysLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            sysLambdaQueryWrapper.eq(SysUserLinkSys::getUserId, user.getId());
+            sysLambdaQueryWrapper.eq(SysUserLinkSys::getSysId, loginBean.getSysId());
+            List<SysUserLinkSys> list = sysUserLinkSysService.list(sysLambdaQueryWrapper);
+            if(list==null || list.size()==0){
+                throw  new SystemException("该用户未授权");
+            }
+        }
         //验证用户
         SysUser.verifyUser(user);
         SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
@@ -186,6 +203,23 @@ public class SysLoginController {
         // 用户信息
         SysUser user = sysUserService.getById(username);
 
+
+        /**
+         *  多个系统登录  添加默认参数解决手机端登陆问题
+         * */
+        if(StringUtils.isBlank(loginBean.getSysId())){
+            loginBean.setSysId("1");
+        }
+        if(!SysConstants.ADMIN.equalsIgnoreCase(username) && !"1".equals(loginBean.getSysId())){
+            LambdaQueryWrapper<SysUserLinkSys> sysLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            sysLambdaQueryWrapper.eq(SysUserLinkSys::getUserId, user.getId());
+            sysLambdaQueryWrapper.eq(SysUserLinkSys::getSysId, loginBean.getSysId());
+            List<SysUserLinkSys> list = sysUserLinkSysService.list(sysLambdaQueryWrapper);
+            if(list==null || list.size()==0){
+                throw  new SystemException("该用户未授权");
+            }
+        }
+
         //验证用户
         SysUser.verifyUser(user);
         SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));

src/main/java/com/ydtech/modules/admin/controller/SysMenuController.java

@@ -27,6 +27,7 @@ public class SysMenuController {
 //    @PreAuthorize("hasAuthority('sys:menu:add') AND hasAuthority('sys:menu:edit')")
     @PostMapping(value = "/save")
     public HttpResult save(@RequestBody SysMenu record) {
+        record.setSysType("1");
         if (StringUtils.isNullOrEmpty(record.getId()) || record.getId().equalsIgnoreCase("0")) {
             return HttpResult.ok(sysMenuService.save(record));
 //            return HttpResult.ok(sysMenuService.insertSelective(record));

src/main/java/com/ydtech/modules/admin/controller/SysRoleController.java

@@ -52,6 +52,7 @@ public class SysRoleController extends BaseController {
         if ((record.getId() == null || record.getId() == 0) && sysRoleService.findByName(record.getName()) != null) {
             return HttpResult.error("角色名已存在!");
         }
+        record.setSysType("1");
         return HttpResult.ok(sysRoleService.saveOrUpdate(record));
     }
 
@@ -77,6 +78,7 @@ public class SysRoleController extends BaseController {
     public HttpResult findAll() {
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysRole::getDelFlag, "0");
+        lqw.eq(SysRole::getSysType, "1");
         List<SysRole> list = sysRoleService.list(lqw);
         return HttpResult.ok(list);
     }
@@ -99,6 +101,7 @@ public class SysRoleController extends BaseController {
         }
 
         lqw.eq(SysRole::getDelFlag, "0");
+        lqw.eq(SysRole::getSysType, "1");
         List<SysRole> list = sysRoleService.list(lqw);
         return HttpResult.ok(list);
     }

src/main/java/com/ydtech/modules/admin/dao/SysRoleMenuMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
 
     String SysMenuSql = "select t.id, t.name, t.parent_id, t.url, t.perms, t.type, t.icon, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag from sys_menu t ";
-    String sysRoleMenuIdSql = " where t.id in (select menu_id from sys_role_menu t1 left join sys_user_role t2 on t1.role_id=t2.role_id where t2.user_id='${userId}') and del_flag=0 ";
+    String sysRoleMenuIdSql = " where t.id in (select menu_id from sys_role_menu t1 left join sys_user_role t2 on t1.role_id=t2.role_id where t2.user_id='${userId}') and del_flag=0  and  t.sys_type='1'";
     String SysMenuSqlT1 = SysMenuSql + sysRoleMenuIdSql;
 
 

src/main/java/com/ydtech/modules/admin/model/SysMenu.java

@@ -46,6 +46,12 @@ public class SysMenu implements Serializable {
     @TableField(exist = false)
     private List<SysMenu> children;
 
+    /***
+     * 添加菜单类型 1.车险 2. 控制台
+     */
+    @TableField(value = "sys_type")
+    private String sysType;
+
 
 }
 

src/main/java/com/ydtech/modules/admin/model/SysRole.java

@@ -19,6 +19,9 @@ public class SysRole implements Serializable {
     private Date lastUpdateTime;
     private Integer delFlag;
 
+    private String sysType;
+
+
     public Long getId() {
         return id;
     }
@@ -35,6 +38,10 @@ public class SysRole implements Serializable {
         this.name = name;
     }
 
+    public String getSysType() {return sysType;}
+
+    public void setSysType(String sysType) {this.sysType = sysType;}
+
     public String getRemark() {
         return remark;
     }

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

@@ -14,6 +14,7 @@ public class LoginBean {
     private String account;
     private String password;
     private String captcha;
+    private String sysId;
     //验证码ID
     private String captchaId;
 

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

@@ -76,8 +76,10 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
         SysUserInfo sysUserInfo = sysUserInfoService.getById(userId);
         SysUserTeamInfoDto sysUserTeamInfoDto = new SysUserTeamInfoDto(sysUser, dept, organization, sysUserInfo);
         SysUserTrack sysUserTrack = sysUserTrackService.getLastTime(userId);
-        sysUserTeamInfoDto.setApproveTime(sysUserTrack.getApproveTime());
-        sysUserTeamInfoDto.setApproveBy(sysUserTrack.getApproveBy());
+        if (sysUserTrack != null) {
+            sysUserTeamInfoDto.setApproveTime(sysUserTrack.getApproveTime());
+            sysUserTeamInfoDto.setApproveBy(sysUserTrack.getApproveBy());
+        }
         return HttpResult.ok(sysUserTeamInfoDto);
     }
 }

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

@@ -49,8 +49,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
 
     @Override
     public List<SysMenu> findByUser(String userName) {
-        LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<>();
+         LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysMenu::getDelFlag, 0);
+        lqw.eq(SysMenu::getSysType, 1);
         if (userName == null || "".equals(userName) || SysConstants.ADMIN.equalsIgnoreCase(userName)) {
 //            return selectList(" where 1=1 and del_flag=0", null);
             return list(lqw);
@@ -79,6 +80,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
         LambdaQueryWrapper<SysMenu> smlqw = new LambdaQueryWrapper<>();
         smlqw.eq(SysMenu::getDelFlag, 0);
         smlqw.in(SysMenu::getId, longs);
+        smlqw.in(SysMenu::getSysType, "1");
         return list(smlqw);
 
 

src/main/java/com/ydtech/modules/esm/controller/EsmUserController.java

@@ -223,4 +223,19 @@ public class EsmUserController extends BaseController {
         return HttpResult.ok(list);
     }
 
+
+    /**
+     * 团队业绩统计-指定用户查询
+     *
+     * @param record
+     * @return
+     */
+    @PostMapping("/queryUserCountForUser")
+    public HttpResult<List<EsmUserPolicyForUserVO>> queryUserCountForUser(@RequestBody TeamUserQryVO record){
+        if (StringUtils.isNullOrEmpty(record.getId()) || StringUtils.isNullOrEmpty(record.getStartdate()) ||
+                StringUtils.isNullOrEmpty(record.getEnddate())) {
+            return HttpResult.error("起止时间/用户id不能为空！");
+        }
+        return HttpResult.ok(esmUserReferrerService.queryUserCountForUser(record));
+    }
 }

src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -12,6 +12,7 @@ import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.QueryChannel;
 import com.ydtech.modules.esm.model.vo.EsmTeamPolicyVO;
+import com.ydtech.modules.esm.model.vo.EsmUserPolicyForUserVO;
 import com.ydtech.modules.esm.model.vo.EsmUserPolicyVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -221,4 +222,7 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
      *  @Description: 查询天数数据
      */
     List<EmployeeIncreaseReportDto> employeeIncreaseReportDay(HashMap<String,Object> map);
+
+
+    List<EsmUserPolicyForUserVO> queryOrderCountForUser(String userId,String startDate, String endDate);
 }

src/main/java/com/ydtech/modules/esm/model/vo/EsmUserPolicyForUserVO.java

@@ -0,0 +1,30 @@
+package com.ydtech.modules.esm.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("团队管理展示-明细-人员明细")
+public class EsmUserPolicyForUserVO implements Serializable {
+
+    private static final long serialVersionUID = 5053893395186078389L;
+
+    private String companyId;//保险公司id
+    @ApiModelProperty(value = "保险公司名称")
+    private String companyName;//保险公司名称
+    @ApiModelProperty(value = "出单笔数")
+    private int ordernum;//出单笔数
+    @ApiModelProperty(value = "核保笔数")
+    private int policynum;//核保笔数
+    @ApiModelProperty(value = "签单保费")
+    private double sumpremium;//签单保费
+    @ApiModelProperty(value = "报价次数")
+    private int bjpolicynum;//报价次数
+    @ApiModelProperty(value = "报价金额")
+    private double bjsumpremium;//报价金额
+
+
+}

src/main/java/com/ydtech/modules/esm/service/EsmUserReferrerService.java

@@ -13,10 +13,7 @@ import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.QueryChannel;
-import com.ydtech.modules.esm.model.vo.EsmTeamPolicyVO;
-import com.ydtech.modules.esm.model.vo.EsmUserCountVO;
-import com.ydtech.modules.esm.model.vo.EsmUserPolicyVO;
-import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
+import com.ydtech.modules.esm.model.vo.*;
 import com.ydtech.modules.order.entity.BasePageResult;
 
 import java.util.List;
@@ -77,7 +74,7 @@ public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
      **/
     BasePageResult<SysUserTeamDto> getTeamUser(AppCustomerManagementQueryVo managementQueryVo, String userId);
 
-
+    public List<EsmUserPolicyForUserVO> queryUserCountForUser(TeamUserQryVO record);
 }
 
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -18,10 +18,7 @@ import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.dao.EsmUserReferrerMapper;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.QueryChannel;
-import com.ydtech.modules.esm.model.vo.EsmTeamPolicyVO;
-import com.ydtech.modules.esm.model.vo.EsmUserCountVO;
-import com.ydtech.modules.esm.model.vo.EsmUserPolicyVO;
-import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
+import com.ydtech.modules.esm.model.vo.*;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.utils.StringUtils;
@@ -468,6 +465,17 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
     }
 
 
+
+    /**
+     * 人员团队业绩统计--指定业务员查询
+     *
+     * @return
+     */
+    @Override
+    public List<EsmUserPolicyForUserVO> queryUserCountForUser(TeamUserQryVO record) {
+        return this.baseMapper.queryOrderCountForUser(record.getId(), record.getStartdate(), record.getEnddate());
+    }
+
 }
 
 

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

@@ -1,6 +1,8 @@
 package com.ydtech.modules.fnc.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.dto.TaskStatisticsDto;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesSumService;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
@@ -29,8 +31,8 @@ public class SettlementDocumentaryFeesSumController {
     }
     @PostMapping("/query")
     @ApiOperation(value = "[1]保司费用查询new")
-    public HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> query(@RequestBody @Valid SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
-        HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> result = settlementDocumentaryFeesSumService.queryNew(settlementDocumentaryFeesSumVo);
+    public HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> query(@RequestBody @Valid SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+        HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> result = settlementDocumentaryFeesSumService.queryNew(settlementDocumentaryFeesSumVo);
         return result;
     }
 }

src/main/java/com/ydtech/modules/fnc/dao/SettlementDocumentaryFeesSumMapper.java

@@ -2,14 +2,17 @@ package com.ydtech.modules.fnc.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesSumVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface SettlementDocumentaryFeesSumMapper extends BaseMapper<SettlementDocumentaryFeesSumEntity> {
-    List<SettlementDocumentaryFeesSumEntity> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+    IPage<SettlementDocumentaryFeesSumEntity> queryNew(@Param("page") Page page,@Param("settlementDocumentaryFeesSumVo") SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
 
 }

src/main/java/com/ydtech/modules/fnc/service/SettlementDocumentaryFeesSumService.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.fnc.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesSumEntity;
@@ -9,6 +10,6 @@ import com.ydtech.modules.order.entity.BasePageResult;
 public interface SettlementDocumentaryFeesSumService extends IService<SettlementDocumentaryFeesSumEntity> {
     HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
 
-    HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
+    HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo);
 
 }

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesSumServiceImpl.java

@@ -3,11 +3,15 @@ package com.ydtech.modules.fnc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
+import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesSumMapper;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
@@ -54,16 +58,18 @@ public class SettlementDocumentaryFeesSumServiceImpl extends ServiceImpl<Settlem
     }
 
     @Override
-    public HttpResult<BasePageResult<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
+    public HttpResult<IPage<SettlementDocumentaryFeesSumEntity>> queryNew(SettlementDocumentaryFeesSumVo settlementDocumentaryFeesSumVo) {
         try {
-            PageInfo<List<SettlementDocumentaryFeesSumEntity>> pageHelper = null;
+            PageVo<SettlementDocumentaryFeesSumEntity> pageVo = new PageVo<>();
+            Page page = new Page(settlementDocumentaryFeesSumVo.getPageNum(), settlementDocumentaryFeesSumVo.getPageSize());
 
-            List<SettlementDocumentaryFeesSumEntity> list = this.baseMapper.queryNew(settlementDocumentaryFeesSumVo);
+            pageVo.setPageNum(settlementDocumentaryFeesSumVo.getPageNum());
+            pageVo.setPageSize(settlementDocumentaryFeesSumVo.getPageSize());
 
-            pageHelper = new PageInfo(list);
-            BasePageResult<SettlementDocumentaryFeesSumEntity> pageResult = new BasePageResult<SettlementDocumentaryFeesSumEntity>(settlementDocumentaryFeesSumVo.getPageNum(),
-                    settlementDocumentaryFeesSumVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);
-            return HttpResult.ok(pageResult);
+
+            IPage<SettlementDocumentaryFeesSumEntity> list = this.baseMapper.queryNew(page,settlementDocumentaryFeesSumVo);
+
+            return HttpResult.ok(list);
         } catch (Exception e) {
             e.printStackTrace();
             return HttpResult.error("查询异常");

src/main/java/com/ydtech/modules/fnc/vo/SettlementDocumentaryFeesSumVo.java

@@ -69,6 +69,6 @@ public class SettlementDocumentaryFeesSumVo implements Serializable {
 
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")
-    private int pageNum=1;
+    private int pageNum;
 
 }

src/main/java/com/ydtech/modules/order/controller/PingAnOrderApiController.java

@@ -188,7 +188,7 @@ public class PingAnOrderApiController {
     public HttpResult<CrawlerPolicyPrintVo> getPolicyPrint(String companyId) throws Exception {
         return this.pingAnOrderApiService.getPolicyPrint(companyId);
     }
-    @PostMapping("/getOrderDetail")
+    @PostMapping("/getDocumentStatusList")
     @ApiOperation(value = "9订单状态查询")
     public HttpResult<Object> getOrderDetail(String companyId) throws Exception {
         return this.pingAnOrderApiService.getDocumentStatusList(companyId);

src/main/java/com/ydtech/modules/order/service/impl/PingAnOrderApiServiceImpl.java

@@ -10,6 +10,7 @@ import com.ydtech.modules.ins.model.pingan.respose.PingAnQuoteRespVo;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.pingan.PinganRequestApiComponents;
+import com.ydtech.modules.order.dao.InsTaskImagesMapper;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsDrivingIntentionInsuranceSon;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -31,6 +32,7 @@ import com.ydtech.modules.order.entity.api.zijin.request.SubmitVerifyRequest;
 import com.ydtech.modules.order.entity.api.zijin.response.QueryClauseDataResponse;
 import com.ydtech.modules.order.entity.config.PingAnConfigureParameters;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
+import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.po.InsTaskImages;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
@@ -87,6 +89,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
 
     private final PinganApiLogService   pinganApiLogService;
 
+    private final InsTaskImagesMapper insTaskImagesMapper;
+
 
     /**
      * @Description 获取财意险险种套餐列表  调用 4.4
@@ -448,9 +452,13 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 ptlAgreementAttribution);
         PinganApiLog pinganApiLog = new PinganApiLog(insAreaCompany.getOrderno(),subOrderNo,insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.existOrder(insAreaCompany.getOrderno());
-        List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(),
-                insAreaCompany.getId(), true);
-        if (insTaskImagesBase64s.isEmpty()) {
+
+        //图片
+        List<InsUploadImagesDto> imgList = insTaskImagesMapper.getByOrderNoInsUploadImagesDtoList(insAreaCompany.getOrderno());
+
+       // List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(),
+       //         insAreaCompany.getId(), true);
+        if (imgList.isEmpty()) {
             return HttpResult.error("影像集合为空");
         } else {
             List<InsTaskImages> listNew = new ArrayList<InsTaskImages>();
@@ -460,14 +468,14 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             // 获取上级目录
             String parentPath = projectFile.getParent();
             List<InsTaskImages> insTaskImages =new ArrayList<>();
-            for (InsTaskImagesBase64 insTaskImagesBase64 : insTaskImagesBase64s) {
-                InsUploadFiles fiels = insUploadFilesService.getById(insTaskImagesBase64.getImageId());
-                InsTaskImages imagevo = insTaskImagesService.getById(insTaskImagesBase64.getId());
+            for (InsUploadImagesDto insUploadImagesDto : imgList) {
+                InsUploadFiles fiels = insUploadFilesService.getById(insUploadImagesDto.getImageId());
+                InsTaskImages imagevo = insTaskImagesService.getById(insUploadImagesDto.getId());
                 String key=parameters.getUserId()+"-"+new SimpleDateFormat("yyyyMMddhhmmss").format(new Date())+"-"+UUID.randomUUID();
                 File file =new File( parentPath+ fiels.getFilePath());
                 imagevo.setPinganKey(key);
                 insTaskImages.add(imagevo);
-                PingAnDocumentClassEnum fileEnum = PingAnDocumentClassEnum.getCode(insTaskImagesBase64.getImageType());
+                PingAnDocumentClassEnum fileEnum = PingAnDocumentClassEnum.getCode(insUploadImagesDto.getImageType());
                 String documentClass=fileEnum.getDocument();
                 String documentType=fileEnum.getDocumentType();
                 String fileName = file.getName();
@@ -1049,26 +1057,41 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 ArrayList<DocumentStatusListResponse.DocumentDTO> documentList = documentStatusListResponse.getDocumentList();
                 Boolean jqflag = false;
                 Boolean sqflag = false;
+                String jqpolicyno=null;
+                String sypolicyno=null;
+                String status="";
+                String noticeNo="";
                 //B5 为 承保
                 for (DocumentStatusListResponse.DocumentDTO dto : documentList) {
-                    if (OrderStatusCodeEnum.ORDER_STATUS_CODE_B5.getCode().equals(dto.getStatus()) && bizApplyNo.equals(dto.getApplyNo()==null?"":dto.getApplyNo())) {
+                    status = dto.getStatus();
+                    noticeNo=dto.getNoticeNo();
+                    if ((bizApplyNo==null?"":bizApplyNo).equals(dto.getApplyNo()==null?"":dto.getApplyNo())) {
+                        jqpolicyno=dto.getPolicyNo();
                         sqflag = true;
                     }
-                    if (OrderStatusCodeEnum.ORDER_STATUS_CODE_B5
-                            .getCode().equals(dto.getStatus()) && forceApplyNo.equals(dto.getApplyNo()==null?"":dto.getApplyNo())) {
+                    if ((forceApplyNo==null?"":forceApplyNo).equals(dto.getApplyNo()==null?"":dto.getApplyNo())) {
+                        sypolicyno=dto.getPolicyNo();
                         jqflag = true;
                     }
                 }
-                if ("单交".equals(insAreaCompany.getProduct()) && !jqflag) {
-                    insAreaCompany.setJqpolicyno(bizApplyNo);
-                } else if (("交三".equals(insAreaCompany.getProduct()) || "交商".equals(insAreaCompany.getProduct())) && !jqflag && !sqflag) {
-                    insAreaCompany.setJqpolicyno(bizApplyNo);
-                    insAreaCompany.setSypolicyno(forceApplyNo);
-                } else if (("单商".equals(insAreaCompany.getProduct()) || "单三".equals(insAreaCompany.getProduct())) && !sqflag) {
-                    insAreaCompany.setSypolicyno(forceApplyNo);
+                if ("单交".equals(insAreaCompany.getProduct()) && jqflag) {
+                    insAreaCompany.setJqpolicyno(jqpolicyno);
+                } else if (("交三".equals(insAreaCompany.getProduct()) || "交商".equals(insAreaCompany.getProduct())) && jqflag && sqflag) {
+                    insAreaCompany.setJqpolicyno(jqpolicyno);
+                    insAreaCompany.setSypolicyno(sypolicyno);
+                } else if (("单商".equals(insAreaCompany.getProduct()) || "单三".equals(insAreaCompany.getProduct())) && sqflag) {
+                    insAreaCompany.setSypolicyno(sypolicyno);
+                }
+                if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B2.getCode().equals(status)){
+                    //已核保待缴费
+                    insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
+                }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B5.getCode().equals(status)){
+                    //说明核保成功，更新大订单和小订单的状态为3  更新为已承保
+                    if(StringUtils.isNotBlank(noticeNo)){
+                        insAreaCompany.setNoticeNo(noticeNo);
+                    }
+                    insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 }
-                //说明核保成功，更新大订单和小订单的状态为3  更新为已承保
-                insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                 return HttpResult.ok("更新状态成功");
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -213,24 +213,28 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
         //审核条件
-        if (agreementProductQueryVo.getIsAudit() != null) {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
-        }
+//        if (agreementProductQueryVo.getIsAudit() != null) {
+//
+//        }
 
+        ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, agreementProductQueryVo.getIsAudit());
+//        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()) {
+//
+//        }
         //产品code
-        if (agreementProductQueryVo.getProductCode() != null && !agreementProductQueryVo.getProductCode().isEmpty()) {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
-        }
-
+        ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
         //费用时间
-        if (agreementProductQueryVo.getCostStartDate() != null) {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.or().gt(PtlAgreementProductCostsNew::getCostsStartDate, agreementProductQueryVo.getCostStartDate())
-                    .lt(PtlAgreementProductCostsNew::getCostsEndDate, agreementProductQueryVo.getCostsEndDate());
-        }
+        ptlAgreementProductCostsNewLambdaQueryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
+                .gt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
 
         //现询费用id
         if(agreementProductQueryVo.getNowCostsId() != null){
             ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getId, agreementProductQueryVo.getNowCostsId());
+            //如果是现询则设置现询id 为1
+            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow, "0");
+        }else{
+            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow, "1");
+
         }
 
         List<PtlAgreementProductCostsNew> pages = baseMapper.selectList(ptlAgreementProductCostsNewLambdaQueryWrapper);
@@ -1909,6 +1913,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         if(inquiryNowFeeQueryVo.getProductId() != null) {
             queryWrapper.eq(PtlAgreementProductCostsNew::getProductId, inquiryNowFeeQueryVo.getProductId());
         }
+        queryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        queryWrapper.gt(PtlAgreementProductCostsNew::getCostsEndDate,LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
         queryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit,"1");
         queryWrapper.eq(PtlAgreementProductCostsNew::getIsInquiryNow,"0");
         List<PtlAgreementProductCostsNew> ptlAgreementProductCostsNews = baseMapper.selectList(queryWrapper);

src/main/resources/application-pre.yml

@@ -327,7 +327,7 @@ pingan:
     bucket: icore-pts-openapi-dmz-stg-pri
     ak: 8CJK29FVFY2IK9W0Y8IIdKWD06MI202F
     sk: K9VIM2C6W2YWDWDVK6966F29229dYMDF
-    signatureUrl: http://39.98.239.48/#/Signature
+    signatureUrl: https://test.baoxianzhanggui.com/web-api/#/Signature
 
 knife4j:
   enable: false

src/main/resources/application-prod.yml

@@ -326,7 +326,7 @@ pingan:
     bucket: icore-pts-openapi-dmz-stg-pri
     ak: 8CJK29FVFY2IK9W0Y8IIdKWD06MI202F
     sk: K9VIM2C6W2YWDWDVK6966F29229dYMDF
-    signatureUrl: http://39.98.239.48/#/Signature
+    signatureUrl: https://test.baoxianzhanggui.com/web-api/#/Signature
 
 knife4j:
   enable: false

src/main/resources/application-test.yml

@@ -409,7 +409,7 @@ pingan:
     bucket: icore-pts-openapi-dmz-stg-pri
     ak: 8CJK29FVFY2IK9W0Y8IIdKWD06MI202F
     sk: K9VIM2C6W2YWDWDVK6966F29229dYMDF
-    signatureUrl: http://39.98.239.48/#/Signature
+    signatureUrl: https://test.baoxianzhanggui.com/web-api
 
 
 xxl:

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -224,4 +224,70 @@
             </if>
         GROUP BY  CONCAT(YEAR ( us.create_time ),'-',LPAD( MONTH ( us.create_time ), 2, '0' ),'-',LPAD( DAY ( us.create_time ), 2, '0' ),' ',LPAD( HOUR ( us.create_time ), 2, '0' ))
     </select>
+
+
+    <select id="queryOrderCountForUser" resultType="com.ydtech.modules.esm.model.vo.EsmUserPolicyForUserVO">
+        select a.companyId as companyId,
+               a.companyName as companyName,
+               a.policynum as bjpolicynum,
+               a.sumpremium as bjsumpremium,
+               b.policynum as ordernum,
+               b.sumpremium as sumpremium,
+               c.policynum as policynum
+        from (
+                 SELECT
+                     iac.company_id AS companyId,
+                     iac.inscompany AS companyName,
+                     COALESCE ( count( iac.company_id ), 0 ) AS policynum,
+                     COALESCE ( sum( jqpremium + sypremium + jypremium ), 0 ) AS sumpremium
+                 FROM
+                     sys_user su
+                         LEFT JOIN ins_orders io ON io.userid = su.id
+                         AND io.createtime BETWEEN #{startDate} AND #{endDate}
+                         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
+                 WHERE
+                     su.id = #{userId}
+                 GROUP BY
+                     iac.company_id,
+                     iac.inscompany
+             ) a left join
+             (
+                 SELECT
+                     iac.company_id AS companyId,
+                     iac.inscompany AS companyName,
+                     COALESCE ( count( iac.company_id ), 0 ) AS policynum,
+                     COALESCE ( sum( jqpremium + sypremium + jypremium ), 0 ) AS sumpremium
+                 FROM
+                     sys_user su
+                         LEFT JOIN ins_orders io ON io.userid = su.id
+                         AND io.createtime BETWEEN #{startDate} AND #{endDate}
+                         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
+                         AND iac.orderstatus = 3
+                 WHERE
+                     su.id = #{userId}
+                 GROUP BY
+                     iac.company_id,
+                     iac.inscompany
+             )b on a.companyId = b.companyId
+             left join
+             (
+                 SELECT
+                     iac.company_id AS companyId,
+                     iac.inscompany AS companyName,
+                     COALESCE ( count( iac.company_id ), 0 ) AS policynum,
+                     COALESCE ( sum( jqpremium + sypremium + jypremium ), 0 ) AS sumpremium
+                 FROM
+                     sys_user su
+                         LEFT JOIN ins_orders io ON io.userid = su.id
+                         AND io.createtime BETWEEN #{startDate} AND #{endDate}
+                         LEFT JOIN ins_area_company iac ON io.orderno = iac.orderno
+                         AND iac.orderstatus = 2
+                 WHERE
+                     su.id = #{userId}
+                 GROUP BY
+                     iac.company_id,
+                     iac.inscompany
+             )c on a.companyId = c.companyId
+        where a.companyId is not null
+    </select>
 </mapper>

src/main/resources/mapper/modules/fnc/SettlementDocumentaryFeesSumMapper.xml

@@ -26,26 +26,26 @@
         settlement_documentary_fees_sum a
         <where>
             1=1
-            <if test="companyId  !=null  and  companyId  !=''">
-                AND a.company_id =#{companyId}
+            <if test="settlementDocumentaryFeesSumVo.companyId  !=null  and  settlementDocumentaryFeesSumVo.companyId  !=''">
+                AND a.company_id =#{settlementDocumentaryFeesSumVo.companyId}
             </if>
-            <if test="settlementStatus  !=null  and  settlementStatus  !=''">
-                AND a.settlement_status =#{settlementStatus}
+            <if test="settlementDocumentaryFeesSumVo.settlementStatus  !=null  and  settlementDocumentaryFeesSumVo.settlementStatus  !=''">
+                AND a.settlement_status =#{settlementDocumentaryFeesSumVo.settlementStatus}
             </if>
-            <if test="invoicingMethod  !=null  and  invoicingMethod  !=''">
-                AND a.invoicing_method =#{invoicingMethod}
+            <if test="settlementDocumentaryFeesSumVo.invoicingMethod  !=null  and  settlementDocumentaryFeesSumVo.invoicingMethod  !=''">
+                AND a.invoicing_method =#{settlementDocumentaryFeesSumVo.invoicingMethod}
             </if>
-            <if test="invoicId  !=null  and  invoicId  !=''">
-                AND a.invoice_id =#{invoicId}
+            <if test="settlementDocumentaryFeesSumVo.invoicId  !=null  and  settlementDocumentaryFeesSumVo.invoicId  !=''">
+                AND a.invoice_id =#{settlementDocumentaryFeesSumVo.invoicId}
             </if>
-            <if test="isNotCar  !=null  and  isNotCar  !=''">
-                AND a.is_not_car =#{isNotCar}
+            <if test="settlementDocumentaryFeesSumVo.isNotCar  !=null  and  settlementDocumentaryFeesSumVo.isNotCar  !=''">
+                AND a.is_not_car =#{settlementDocumentaryFeesSumVo.isNotCar}
             </if>
-            <if test="partnerCompaniesId  !=null  and  partnerCompaniesId  !=''">
-                AND a.partner_companies_id =#{partnerCompaniesId}
+            <if test="settlementDocumentaryFeesSumVo.partnerCompaniesId  !=null  and  settlementDocumentaryFeesSumVo.partnerCompaniesId  !=''">
+                AND a.partner_companies_id =#{settlementDocumentaryFeesSumVo.partnerCompaniesId}
             </if>
-          <if test="completionStatus  !=null  and  completionStatus  !=''">
-                AND a.completion_status =#{completionStatus}
+          <if test="settlementDocumentaryFeesSumVo.completionStatus  !=null  and  settlementDocumentaryFeesSumVo.completionStatus  !=''">
+                AND a.completion_status =#{settlementDocumentaryFeesSumVo.completionStatus}
             </if>
         </where>
     </select>