Merge branch 'test' into test_mq

src/main/java/com/ydtech/constants/enums/InsurKind.java

@@ -33,7 +33,9 @@ public enum InsurKind {
     TY1("TY1", "道路救援服务特约条款"),
     TY2("TY2", "车辆安全检测特约条款"),
     TY3("TY3", "代为驾驶服务特约条款"),
-    TY4("TY4", "代为送检服务特约条款");
+    TY4("TY4", "代为送检服务特约条款"),
+    SY_WBDWGZ("SY_WBDWGZ","附加外部电网故障损失险");
+
 
     private final String code;
 

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

@@ -148,9 +148,9 @@ public class SysUserController extends BaseController {
      */
     @PostMapping(value = "/queryPage")
     public HttpResult queryPage(@RequestBody PageRequest pageRequest) {
-        String deptId = pageRequest.getColumnFilterValue(pageRequest, "deptId");
+        String deptId = pageRequest.getColumnFilterValue(pageRequest, "deptid");
         String name = pageRequest.getColumnFilterValue(pageRequest, "name");
-        String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
+        String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept") == null ? "0" : pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
         String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
         String roleId = pageRequest.getColumnFilterValue(pageRequest, "roleId");
         String deptName = pageRequest.getColumnFilterValue(pageRequest, "deptName");

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

@@ -106,4 +106,20 @@ public class SysUserLinkAreaController extends BaseController {
             return HttpResult.error("查询错误"+e.getMessage());
         }
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Description: 查询所有的人员列表+分页
+     */
+    @PostMapping("findAllUsers")
+    @ApiOperation("查询所有的人员列表+分页")
+    public HttpResult<BasePageResult<SysUserBaseVO>> findAllUsers(@RequestBody SysUserDto sysUserDto) {
+        try{
+            BasePageResult<SysUserBaseVO> result = sysUserLinkAreaService.findAllUsers(sysUserDto);
+            return HttpResult.ok("查询数据成功", result);
+        }catch (Exception e){
+            return HttpResult.error("查询错误"+e.getMessage());
+        }
+    }
 }

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

@@ -549,6 +549,13 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> findDxZyUserList();
 
     List<SysUser> selectByUserId(List<String> ids);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/12/25 18:28
+     *  @Description:  查询所有的人员
+     */
+    Page<SysUserBaseVO> findAllUsers(@Param("page") Page<SysUserBaseVO> page, @Param("user") SysUserDto sysUserDto);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/SysUserLinkAreaService.java

@@ -72,4 +72,12 @@ public interface SysUserLinkAreaService extends IService<SysUserLinkArea> {
      *  @Description: 查询用户绑定区域的代理人信息
      */
     List<String> findUserIdsByLoginUserId(String  userId);
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/12/25 17:52
+     *  @Description: 查询所有的用户
+     */
+    BasePageResult<SysUserBaseVO> findAllUsers(SysUserDto sysUserDto);
 }

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

@@ -171,4 +171,18 @@ public class SysUserLinkAreaServiceImpl extends ServiceImpl<SysUserLinkAreaMappe
         }
         return  null;
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/4/26 17:23
+     *  @Description:  查询用户分页
+     */
+    @Override
+    public BasePageResult<SysUserBaseVO> findAllUsers(SysUserDto sysUserDto) {
+        Page<SysUserBaseVO> page = new Page<>(sysUserDto.getPageNum(),
+                sysUserDto.getPageSize());
+        Page<SysUserBaseVO> userPageResult = sysUserMapper.findAllUsers(page, sysUserDto);
+        return  new BasePageResult<>(sysUserDto.getPageNum(), page.getSize(), userPageResult.getTotal(), page.getPages(),
+                userPageResult.getRecords());
+    }
 }

src/main/java/com/ydtech/modules/order/entity/api/yangguang/request/YangGuangAccuracyCalculateRequest.java

@@ -751,6 +751,7 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
             this.CarCheckStatus = "2";
             this.Inputnewenergyflag = carInfoVo.isNewEnergy() ? "1" : "0";
             this.FuelType = carInfoVo.getEnergyType();
+            this.SeatCount = carInfoVo.getSeatCount();
         }
     }
 

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

@@ -409,6 +409,13 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
                 kind.setAmount(kindInfoVo.getAmount());
             }
 
+            if (InsurKind.SY_WBDWGZ.getCode().equals(kindInfoVo.getKindCode())){
+                KindInfoVo aKind = kindList.stream().filter(x -> x.getKindCode().equals(InsurKind.A.getCode())).findFirst().orElse(null);
+                if(aKind != null) {
+                    kind.setAmount(map.get("A_amount"));
+                }
+            }
+
             if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
                 kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
             }

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -1159,6 +1159,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreement.setId(null);
         ptlAgreement.setAuditStatus(0);
         ptlAgreement.setValidStatus(String.valueOf(ValidStatus.AVS_0.getCode()));
+        ptlAgreement.setCreateTime(LocalDateTime.now());
+        ptlAgreement.setUpdateTime(LocalDateTime.now());
+        ptlAgreement.setCreator(BaseController.getUserId());
+        ptlAgreement.setModifiedName(BaseController.getUserId());
         save(ptlAgreement);
 
         // 复制账号信息

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

@@ -842,11 +842,12 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         String userId = BaseController.getUser().getId();
         PtlAgreementProductCostsNewHistory ptlAgreementProductCostsNewHistory = new PtlAgreementProductCostsNewHistory(ptlAgreementProductCostsNew, ptlAgreementProductCostsExport, OperatorType.UPDATE, uuid, userId);
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNewHistory);
+        ptlAgreementProductCostsNewHistory.setId(uuid);
         ptlAgreementProductCostsNewHistoryService.save(ptlAgreementProductCostsNewHistory);
 
         // 获取上次提交的信息
         List<PtlAgreementProductCostsAttrLink> ptlAgreementProductCostsAttrLinkList = ptlAgreementProductCostsAttrLinkService.getByCostsId(ptlAgreementProductCostsNew.getId());
-        List<String> costsAttrLinkId = ptlAgreementProductCostsAttrLinkList.stream().map(PtlAgreementProductCostsAttrLink::getCostsId).collect(Collectors.toList());
+        List<String> costsAttrLinkId = ptlAgreementProductCostsAttrLinkList.stream().map(PtlAgreementProductCostsAttrLink::getId).collect(Collectors.toList());
 
         //设置费用因子属性
         //先删除属性值

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

@@ -60,9 +60,6 @@
             <if test="sysUser.roleId != null &amp;&amp; sysUser.roleId != ''">
                 and sur.role_id = #{sysUser.roleId}
             </if>
-            <if test="sysUser.deptId != null &amp;&amp; sysUser.deptId != ''">
-                and su.dept_id = #{sysUser.deptId}
-            </if>
 
             <if test="sysUser.status != null">
                 and su.status = #{sysUser.status}
@@ -106,7 +103,6 @@
         select
         <include refid="Sys_User_Column_List"/>
         <include refid="Sys_User_Where_Clause"></include>
-
          <if test="sysUser.deptName != null &amp;&amp; sysUser.deptName != ''">
             <include refid="Sys_User_Where_Clause_deptName"></include>
         </if>
@@ -2102,4 +2098,36 @@
             su.id = #{item}
         </foreach>
     </select>
+
+    <select id="findAllUsers" resultType="com.ydtech.modules.admin.model.vo.SysUserBaseVO">
+        SELECT
+        t1.id AS userId,
+        t1.NAME AS NAME,
+        t1.mobile AS mobile,
+        t1.`status` AS `status`,
+        t2.id AS deptId,
+        t2.`name` AS deptName,
+        sd2.id AS pDeptId,
+        sd2.`name` AS pDeptName
+        FROM
+        sys_user t1
+        LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
+        WHERE
+        t1.`status` = 1
+        <if test='user !=null  '>
+            <if test='user.name !=null and user.name!="" '>
+                and t1.name like CONCAT('%', #{user.name}, '%')
+            </if>
+            <if test='user.userId !=null and user.userId!="" '>
+                and t1.id = #{user.userId}
+            </if>
+            <if test='user.mobile !=null and user.mobile!=""  '>
+                and t1.mobile = #{user.mobile}
+            </if>
+            <if test='user.deptId !=null and user.deptId!=""  '>
+                and t2.id like CONCAT('', #{user.deptId}, '%')
+            </if>
+        </if>
+    </select>
 </mapper>