Merge remote-tracking branch 'origin/test'

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

@@ -32,7 +32,10 @@ public class SysPositionController extends BaseController {
     @GetMapping("/all")
     @ApiOperation("查询全部岗位信息")
     public HttpResult<List<SysPosition>> getAll() {
-        List<SysPosition> list = sysPositionService.list();
+        List<SysPosition> list = sysPositionService
+                .lambdaQuery()
+                .eq(SysPosition::getStatus, "0")
+                .list();
         return HttpResult.ok(list);
     }
 

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

@@ -12,6 +12,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+
 @Slf4j
 @RestController
 @RequestMapping("sysPoster")

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

@@ -109,8 +109,6 @@ public interface SysUserService extends IService<SysUser> {
 
     HttpResult updateUserInfo(String userId, SysUser2Vo sysUserVo);
 
-    List<SysUser> getAllUsers(String userId);
-
     List<SysUser> findAllAgentRoleUser(String userId, String roleId);
 
     int getDeptLevel(SysUser2Vo sysUser2Vo);

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.SysConstants;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.RoleConstants;
@@ -22,16 +21,13 @@ import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
 import com.ydtech.modules.admin.service.*;
-import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
-import com.ydtech.modules.esm.model.EsmInsAttributionTemplate;
 import com.ydtech.modules.esm.model.EsmUserImage;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.model.vo.EsmUserImageVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
-import com.ydtech.modules.ins.model.InsOrdersExcel;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -40,11 +36,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 @Service
@@ -176,7 +169,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             quTeamNums.add(teamNum);
         });
 
-        List<QuTeamNum> collect1 = quTeamNums.stream().skip((quTeamNumDto.getPageNo() - 1) * quTeamNumDto.getPageSize()).limit(quTeamNumDto.getPageSize()).
+        List<QuTeamNum> collect1 =
+                quTeamNums.stream().skip((quTeamNumDto.getPageNo() - 1) * quTeamNumDto.getPageSize()).limit(quTeamNumDto.getPageSize()).
                 collect(Collectors.toList());
         IPage<QuTeamNum> page = new Page<>(quTeamNumDto.getPageNo(), quTeamNumDto.getPageSize());
         page.setRecords(collect1);
@@ -624,9 +618,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //用户详情信息
         SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
         sysUserInfo.setId(userId);
-        if (null == sysUserInfo.getRemark()) sysUserInfo.setRemark("");
+        if (null == sysUserInfo.getRemark()) {
+            sysUserInfo.setRemark("");
+        }
         sysUserInfoService.saveOrUpdate(sysUserInfo);
-
         // 影像资料
         LambdaQueryWrapper<EsmUserImage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(EsmUserImage::getUserId, userId);
@@ -639,16 +634,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return HttpResult.ok("修改成功");
     }
 
-
-    @Override
-    public List<SysUser> getAllUsers(String userId) {
-        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysUser::getStatus, "1");
-        lqw.eq(StringUtils.isNotEmpty(userId), SysUser::getId, userId);
-        List<SysUser> lst = list(lqw);
-        return lst;
-    }
-
     @Override
     public List<SysUser> findAllAgentRoleUser(String userId, String roleId) {
         return super.baseMapper.findAllAgentRoleUser(userId, roleId);
@@ -672,6 +657,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 根据机构代码，查询所有人员
+     *
      * @param deptId
      * @return
      */
@@ -679,9 +665,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUser> findUserList(String deptId) {
         LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysUser::getStatus, "1");
-        lqw.eq(SysUser::getDeptId,deptId);
-        List<SysUser> lst = list(lqw);
-        return lst;
+        lqw.eq(SysUser::getDeptId, deptId);
+        return list(lqw);
     }
 }
 

src/main/java/com/ydtech/modules/ins/model/guoren/CarPriceReq.java

@@ -142,7 +142,7 @@ public class CarPriceReq {
         prpTitemCar.setEnrollDate(carInfo.getIssueDate());
         //核定载客数
         prpTitemCar.setSeatCount(carInfo.getSeatCount());
-        prpTitemCar.setFuelType("0");
+        prpTitemCar.setFuelType(vinQ.getFuelType());
 
         prpTitemCar.setTonCountlb(vinQ.getTonCount());
 //        prpTitemCar.setTonCountlb("0");

src/main/java/com/ydtech/modules/ins/model/guoren/PremiumReq.java

@@ -96,7 +96,7 @@ public class PremiumReq {
         }
         //未投保商业
         if (null == quoteReq.getBi()) {
-            BiDTO biDto = buildBiDto(ownerInfo, null, null, null, null, false, new ArrayList<>());
+            BiDTO biDto = buildBiDto(ownerInfo, null, null, null, vinQ, false, new ArrayList<>());
             quoteReq.setBi(biDto);
         }
 
@@ -233,7 +233,6 @@ public class PremiumReq {
             biPrpTitemCar.setTermsSystem(ClauseTypeSystem.CTS_04.getCode());
         }
 
-        biPrpTitemCar.setTermsSystem("04");
         biPrpTitemCar.setClauseType("F54");
         biPrpTitemCar.setCarOwner(ownerInfo.getName());
         biPrpTitemCar.setCarOwnerIdentifyNumber(ownerInfo.getIdentifyNumber());

src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -520,8 +520,8 @@ public class InvReceivableServiceImpl implements InvReceivableService {
                         .add(invSource.getNonCarPremiumTax().multiply(invSource.getMaxNonCarReceivableRatio())));
         invSource.setClearingState("未结算".equals(invSource.getClearingState()) ? "0" :
                 "已结算".equals(invSource.getClearingState()) ? "1" : invSource.getClearingState());
-        invSource.setInsuranceClearingState("未结算".equals(invSource.getClearingState()) ? "0" :
-                "已结算".equals(invSource.getClearingState()) ? "1" : invSource.getClearingState());
+        invSource.setInsuranceClearingState("未结算".equals(invSource.getInsuranceClearingState()) ? "0" :
+                "已结算".equals(invSource.getInsuranceClearingState()) ? "1" : invSource.getInsuranceClearingState());
         return invSourceMapper.updateById(invSource) > 0 ? true : false;
     }