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

sql/Online.sql

@@ -1,20 +0,0 @@
---  add by hy   2024-04-27 添加 用户系统树权限关联表
-DROP TABLE IF EXISTS `sys_user_tree_showlevel`;
-CREATE TABLE `sys_user_tree_showlevel`  (
-                                            `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-                                            `user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                            `show_level` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                            `create_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                            `create_time` datetime(0) NULL DEFAULT NULL,
-                                            PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- 创建密码管理表
-CREATE TABLE `sys_password` (
-                                `id` bigint NOT NULL AUTO_INCREMENT,
-                                `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型',
-                                `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '功能描述',
-                                `password` varchar(100) CHARACTER SET utf8mb3 DEFAULT NULL COMMENT '密码',
-                                `salt` varchar(100) CHARACTER SET utf8mb3 DEFAULT NULL COMMENT '盐',
-                                PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1787760730510000129 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='机构密码';

src/main/java/com/ydtech/constants/sys/SystemConstant.java

@@ -11,11 +11,6 @@ public class SystemConstant {
 
     protected static final String[] SYS_ROLE_TEAM_LEADER = {
             RoleConstants.R01.getCode(),
-            RoleConstants.R15.getCode(),
-            RoleConstants.R16.getCode(),
-            RoleConstants.R17.getCode(),
-            RoleConstants.R18.getCode(),
-            RoleConstants.R21.getCode()
     };
 
     public static String[] getSysRoleTeamLeader(){

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

@@ -53,30 +53,12 @@ public class SysDeptController extends BaseController {
         if (sysDeptRemoveVo.getPassword() == null) {
             return HttpResult.error("输入的密码不能为空");
         }
-        String username = BaseController.getUser().getId();
         SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.DEPT.getCode()));
-        SysPassword generalPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
         // 判断机构删除密码是否为空
-        if (sysPassword == null) {
-            // 机构删除密码为空时,直接使用万能密码进行验证
-            if (generalPassword != null && !"admin".equals(username)
-                && PasswordUtils.matches(generalPassword.getSalt(), sysDeptRemoveVo.getPassword(), generalPassword.getPassword())) {
-                sysDeptService.deleteDept(sysDeptRemoveVo);
-                return HttpResult.ok();
-            } else {
-                return HttpResult.error("密码错误");
-            }
-        }
-
         if (PasswordUtils.matches(sysPassword.getSalt(), sysDeptRemoveVo.getPassword(), sysPassword.getPassword())) {
             sysDeptService.deleteDept(sysDeptRemoveVo);
             return HttpResult.ok();
         }
-        // 如果机构删除密码验证失败,再使用万能密码进行验证
-        if (generalPassword != null && !"admin".equals(username) && PasswordUtils.matches(generalPassword.getSalt(), sysDeptRemoveVo.getPassword(), generalPassword.getPassword())) {
-            sysDeptService.deleteDept(sysDeptRemoveVo);
-            return HttpResult.ok();
-        }
         return HttpResult.error("密码错误");
     }
 

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

@@ -3,18 +3,22 @@ package com.ydtech.modules.admin.controller;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.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.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.SysUserRoleService;
@@ -72,6 +76,8 @@ public class SysLoginController {
 
     private final MasterPasswordConfig masterPasswordConfig;
 
+    private final SysPasswordService sysPasswordService;
+
     @GetMapping("captcha.jpg")
     @ApiOperation(value = "获取验证码", produces = "application/octet-stream")
     public void captcha(HttpServletResponse response, HttpServletRequest request) throws IOException {
@@ -137,10 +143,10 @@ public class SysLoginController {
         SysUser user = sysUserService.getById(username);
         //验证用户
         SysUser.verifyUser(user);
-
+        SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
         // 万能密码设置
-        if (!"admin".equals(username) && PasswordUtils.matches(masterPasswordConfig.getSalt(), password,
-                masterPasswordConfig.getCiphertext())) {
+        if (!"admin".equals(username) && PasswordUtils.matches(sysPassword.getSalt(), password,
+                sysPassword.getPassword())) {
             log.info("万能密码登录系统");
         } else {
             if (!PasswordUtils.matches(user.getSalt(), password, user.getPassword())) {
@@ -182,10 +188,10 @@ public class SysLoginController {
 
         //验证用户
         SysUser.verifyUser(user);
-
+        SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
         // 万能密码设置
-        if (!"admin".equals(username) && PasswordUtils.matches(masterPasswordConfig.getSalt(), password,
-                masterPasswordConfig.getCiphertext())) {
+        if (!"admin".equals(username) && PasswordUtils.matches(sysPassword.getSalt(), password,
+                sysPassword.getPassword())) {
             log.info("万能密码登录系统");
         } else {
             if (!PasswordUtils.matches(user.getSalt(), password, user.getPassword())) {

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -136,7 +136,7 @@ public class RuleAttrMappingVo {
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("MotorVehicleDamageInsurance", String.valueOf(kindInfoVo.getAmount())));
             //第三者责任险
             if (InsurKind.B.getCode().equals(kindInfoVo.getKindCode()))
-                ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyLiabilityInsurance", String.valueOf(kindInfoVo.getAmount())));
+                ruleAttrMappingVoList.add(new RuleAttrMappingVo("ThirdPartyLiabilityInsurance", String.valueOf(Double.valueOf(kindInfoVo.getAmount()).intValue())));
             //司机责任险
             if (InsurKind.D3.getCode().equals(kindInfoVo.getKindCode()))
                 ruleAttrMappingVoList.add(new RuleAttrMappingVo("DriverLiabilityInsurance", String.valueOf(kindInfoVo.getAmount())));

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -770,7 +770,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         double v = Double.parseDouble(value);
         //统一处理数值
         if("1".equals(ptlAgreementProductCostsAttrLink.getOperator())){
-            if(Integer.parseInt(ptlAgreementProductCostsAttrLink.getMin()) <= v &&
+            if(Double.parseDouble(ptlAgreementProductCostsAttrLink.getMin()) <= v &&
                     Double.parseDouble(ptlAgreementProductCostsAttrLink.getMax()) >= v){
                 return true;
             }

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -105,8 +105,12 @@ public class QuoteVerificationAspect {
                 }
             } catch (Exception ignored) {
                 log.debug("费用因子异常,车牌号:" + insOrders.getLicenseno());
+                log.debug("费用因子异常消息:" + ignored.toString());
                 log.debug("费用因子异常消息:" + ignored.getMessage());
-                log.debug("费用因子异常堆栈:" + ignored.getStackTrace());
+                //打印异常堆栈信息
+                for(StackTraceElement stackTraceElement : ignored.getStackTrace()){
+                    log.debug(stackTraceElement.toString());
+                }
             }
         }
     }

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

@@ -144,10 +144,16 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
     @Override
     public Page<InsOrders> getAuditOrders(Page page, OrderQueryVo orderQueryVo) {
-        if(orderQueryVo.getStartDate() != null && orderQueryVo.getEndDate() != null){
-            orderQueryVo.setStartDateStr(orderQueryVo.getStartDate().toString());
-            orderQueryVo.setEndDateStr(orderQueryVo.getEndDate().toString());
+        if(orderQueryVo.getQuoteStartDateStr() != null && orderQueryVo.getQuoteEndDateStr() != null){
+            orderQueryVo.setQuoteStartDateStr(orderQueryVo.getQuoteStartDateStr().toString() + " 00:00:00");
+            orderQueryVo.setQuoteEndDateStr(orderQueryVo.getQuoteEndDateStr().toString() + " 23:59:59");
         }
+
+        if(orderQueryVo.getAttachStartDateStr() != null && orderQueryVo.getAttachEndDateStr() != null){
+            orderQueryVo.setAttachStartDateStr(orderQueryVo.getAttachStartDateStr().toString() + " 00:00:00");
+            orderQueryVo.setAttachEndDateStr(orderQueryVo.getAttachEndDateStr().toString() + " 23:59:59");
+        }
+
         Page<InsOrders> pendingAuditOrders = baseMapper.getAuditOrders(page, orderQueryVo);
         pendingAuditOrders.getRecords().forEach(item->{
             if(item.getAuditStatus() == null){

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

@@ -137,7 +137,8 @@
         su2.name AS auditUser,
         ifa.audittime as auditTime,
         ifa.auditstatus as auditStatus,
-        eic.namesimple as partnerCompaniesName
+        eic.namesimple as partnerCompaniesName,
+        iac.id as  subOrderId
         FROM
         ins_orders io
         LEFT JOIN ins_fee_audit ifa ON ifa.orderno = io.orderno
@@ -186,9 +187,6 @@
         <if test="params.attachStartDateStr != null and params.attachStartDateStr != ''">
             AND iac.signing_time BETWEEN #{params.attachStartDateStr} and #{params.attachEndDateStr}
         </if>
-        <if test="params.startDateStr != null and params.startDateStr != ''">
-            AND createtime BETWEEN #{params.startDateStr} and #{params.endDateStr}
-        </if>
         <if test="params.provinceId != null and params.provinceId != ''">
             and io.deptid like "${params.provinceId}%"
         </if>
@@ -264,7 +262,7 @@
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
         WHERE
-        a.id NOT IN (
+        a.ins_order_no NOT IN (
         SELECT
         ins_order_no
         FROM
@@ -293,7 +291,7 @@
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
         WHERE
-        a.id NOT IN (
+        a.ins_order_no NOT IN (
         SELECT
         ins_order_no
         FROM
@@ -323,7 +321,7 @@
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
         WHERE
-        a.id NOT IN (
+        a.ins_order_no NOT IN (
         SELECT
         ins_order_no
         FROM