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

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/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/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>