1.新增系统管理功能

2.结算明细问题

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

@@ -1,6 +1,8 @@
 package com.ydtech.modules.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.SysSysAddDto;
 import com.ydtech.modules.admin.model.dto.SysSysQueryDto;
@@ -11,12 +13,16 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -47,9 +53,21 @@ public class SysSysController extends BaseController {
     @PostMapping("addOrUpdate")
     @ApiOperation("系统表添加修改")
     public HttpResult<Object> addOrUpdate(@RequestBody SysSysAddDto sysSysAddDto) {
-        if(StringUtils.isBlank(sysSysAddDto.getSystemCode())) {
+        if(StringUtils.isBlank(sysSysAddDto.getSystemName())) {
             return HttpResult.error("系统名称不能为空");
         }
+        // 假设sysSysAddDto和sysSysService已经定义好了
+        LambdaQueryWrapper<SysSys> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysSys::getSystemName, sysSysAddDto.getSystemName());
+
+        if (sysSysAddDto.getId() != null) {
+            queryWrapper.ne(SysSys::getId, sysSysAddDto.getId());
+        }
+        SysSys sysSys = sysSysService.getOne(queryWrapper);
+
+        if (ObjectUtils.isNotEmpty(sysSys)) {
+            return HttpResult.error("系统名称重复");
+        }
         if(StringUtils.isBlank(sysSysAddDto.getSystemCode())) {
             return HttpResult.error("系统编码不能为空");
         }
@@ -75,4 +93,13 @@ public class SysSysController extends BaseController {
             return HttpResult.error("删除失败"+e.getMessage());
         }
     }
+
+    @PostMapping("sysList")
+    @ApiOperation("系统字典")
+    public HttpResult<List<SysSys>> sysList() {
+        LambdaQueryWrapper<SysSys> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysSys::getSystemStatus, "1");
+        List<SysSys> list = sysSysService.list(queryWrapper);
+        return  HttpResult.ok(list);
+    }
 }

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

@@ -56,11 +56,11 @@ public class SysUserLinkSysController extends BaseController {
     @PostMapping("addOrUpdate")
     @ApiOperation("添加修改")
     public HttpResult<Object> addOrUpdate(@RequestBody SysUserLinkSysAddDto sysUserLinkSysAddDto) {
-        if(StringUtils.isBlank(sysUserLinkSysAddDto.getUserId())) {
+        if(CollectionUtils.isEmpty(sysUserLinkSysAddDto.getUserIds()) && "0".equals(sysUserLinkSysAddDto.getFlag()) ) {
             return HttpResult.error("用户工号不能为空");
         }
-        if(CollectionUtils.isEmpty(sysUserLinkSysAddDto.getList())) {
-            return HttpResult.error("系统集合对象不能为空");
+        if(sysUserLinkSysAddDto.getSysId() ==null ) {
+            return HttpResult.error("请选择系统");
         }
         try{
             sysUserLinkSysService.addOrUpdate(sysUserLinkSysAddDto);
@@ -68,7 +68,6 @@ public class SysUserLinkSysController extends BaseController {
         }catch (Exception e){
             return HttpResult.error("操作失败"+e.getMessage());
         }
-
     }
 
     @PostMapping("delete")

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

@@ -8,6 +8,8 @@ import com.ydtech.modules.admin.model.dto.SysUserLinkSysQueryDto;
 import com.ydtech.modules.admin.model.po.SysUserLinkSys;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
 * @author Administrator
@@ -30,6 +32,11 @@ public interface SysUserLinkSysMapper extends BaseMapper<SysUserLinkSys> {
      *  @Description:  查询所有正常的用户分页查询
      */
     Page<SysUser> queryUserPage(@Param("page") Page<SysUser> page, @Param("vo") SysUserDto sysUserDto);
+
+    SysUserLinkSys checkSys(@Param("userId") String id, @Param("sysId") String sysId);
+
+    List<String> setByUserIds(@Param("userIds") List<String> userIds, @Param("sysId") Long sysId);
+
 }
 
 

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

@@ -393,6 +393,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *  @Description:  查询所有的后线人员
      */
     List<SysUser> findHxUserList();
+    @Select("select id   from  sys_user  where   status ='1' ")
+    List<String> getUserIds();
+
+
 }
 
 

src/main/java/com/ydtech/modules/admin/model/dto/SysUserLinkSysAddDto.java

@@ -16,13 +16,21 @@ import java.util.List;
 @Data
 @ApiModel("系统表关联用户添加对象")
 public class SysUserLinkSysAddDto {
-
+    @ApiModelProperty(value = "用户id")
+    private  String  userId;
     /***
      *  系统名称
      */
-    @ApiModelProperty(value = "用户id")
-    private  String  userId;
+    @ApiModelProperty(value = "用户数组")
+    private  List<String>  userIds;
 
+    @ApiModelProperty(value = "系统id")
+    private Long  sysId;
     @ApiModelProperty(value = "系统集合对象")
     private List<Long>   list =new ArrayList<>();
+
+    @ApiModelProperty(value = "是否全部  1 全部  0 不是全部")
+    private  String  flag;
+
+
 }

src/main/java/com/ydtech/modules/admin/model/po/SysUserLinkSys.java

@@ -64,6 +64,18 @@ public class SysUserLinkSys implements Serializable {
     @TableField(exist=false)
     private String systemName;
 
+    /**
+     * 系统编码
+     */
+    @TableField(exist=false)
+    private String systemCode;
+
+    /**
+     * 系统状态
+     */
+    @TableField(exist=false)
+    private String systemStatus;
+
     /**
      * 用户姓名
      */

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.dto.SysSysAddDto;
 import com.ydtech.modules.admin.model.dto.SysSysQueryDto;
 import com.ydtech.modules.admin.model.po.SysSys;
+import com.ydtech.modules.admin.model.po.SysUserLinkSys;
 import com.ydtech.modules.order.entity.BasePageResult;
 
 import java.util.List;

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

@@ -53,4 +53,6 @@ public interface SysUserLinkSysService extends IService<SysUserLinkSys> {
      *  @Description:  查看所有的用户表
      */
     BasePageResult<SysUser> queryUserPage(SysUserDto sysUserDto);
+
+    SysUserLinkSys checkSys(String id, String sysId);
 }

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

@@ -193,6 +193,7 @@ public interface SysUserService extends IService<SysUser> {
      */
     List<SysUser> findHxUserList();
 
+    List<String> getUserIds();
     /**
      * 离职申请
      * @param sysUserVO

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

@@ -55,6 +55,7 @@ public class SysSysServiceImpl extends ServiceImpl<SysSysMapper, SysSys>
             //修改
             SysSys sys = this.getById(sysSysAddDto.getId());
             BeanUtils.copyProperties(sysSysAddDto, sys);
+            sys.setUpdateUser(BaseController.getUser().getId());
             this.updateById(sys);
         }else{
             //添加

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

@@ -13,8 +13,10 @@ import com.ydtech.modules.admin.model.po.SysSys;
 import com.ydtech.modules.admin.model.po.SysUserLinkSys;
 import com.ydtech.modules.admin.service.SysSysService;
 import com.ydtech.modules.admin.service.SysUserLinkSysService;
+import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +40,8 @@ public class SysUserLinkSysServiceImpl extends ServiceImpl<SysUserLinkSysMapper,
 
     @Autowired
     private SysSysService sysSysService;
+    @Autowired
+    private SysUserService sysUserService;
 
     /**
      *  @version
@@ -61,22 +65,27 @@ public class SysUserLinkSysServiceImpl extends ServiceImpl<SysUserLinkSysMapper,
      */
     @Override
     public void addOrUpdate(SysUserLinkSysAddDto sysUserLinkSysAddDto) {
-        //先删除后添加
-        this.getBaseMapper().delete(new QueryWrapper<SysUserLinkSys>()
-                .lambda()
-                .eq(SysUserLinkSys::getUserId, sysUserLinkSysAddDto.getUserId()));
-        String userId = sysUserLinkSysAddDto.getUserId();
-        List<Long> list = sysUserLinkSysAddDto.getList();
-        List<SysUserLinkSys>  addList =new ArrayList<SysUserLinkSys>();
-        if(CollectionUtils.isNotEmpty(list)){
-            for (Long sysId : list){
-                SysUserLinkSys  sysUserLinkSys =new SysUserLinkSys(sysId, userId,new Date(), new BaseController().getUser().getId(), new Date(), new BaseController().getUser().getId());
-                addList.add(sysUserLinkSys);
+        List<String> userIds ;
+        if("1".equals(sysUserLinkSysAddDto.getFlag())){
+            userIds =  sysUserService.getUserIds();
+        }else {
+            userIds =  sysUserLinkSysAddDto.getUserIds();
+        }
+        if (userIds.size() > 0 && sysUserLinkSysAddDto.getSysId() != null && StringUtils.isNotEmpty(sysUserLinkSysAddDto.getFlag())) {
+            List<String> existUserIds = baseMapper.setByUserIds(userIds, sysUserLinkSysAddDto.getSysId());
+            userIds.removeAll(existUserIds);
+            List<SysUserLinkSys> addList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                for (String userId : userIds) {
+                    SysUserLinkSys sysUserLinkSys = new SysUserLinkSys(sysUserLinkSysAddDto.getSysId(), userId, new Date(), userId, new Date(), new BaseController().getUser().getId());
+                    addList.add(sysUserLinkSys);
+                }
+                //添加
+                this.saveBatch(addList, 50);
             }
-            //添加
-           this.saveBatch(addList,50);
         }
     }
+
     /**
      *  @version
      *  @author: hxl
@@ -113,6 +122,11 @@ public class SysUserLinkSysServiceImpl extends ServiceImpl<SysUserLinkSysMapper,
         return  new BasePageResult<>(sysUserDto.getPageNum(), page.getSize(), result.getTotal(), page.getPages(),
                 result.getRecords());
     }
+
+    @Override
+    public SysUserLinkSys checkSys(String id, String sysId) {
+        return baseMapper.checkSys(id,sysId);
+    }
 }
 
 

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

@@ -1499,6 +1499,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         esmUserImageService.save(esmUserImage);
         return true;
     }
+
+    @Override
+    public List<String> getUserIds() {
+        return baseMapper.getUserIds();
+    }
 }
 
 

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

@@ -129,7 +129,7 @@ public interface InsPlyIncomeMapper extends BaseMapper<InsPlyIncome> {
      *  @Date: 2024/6/18 10:15
      *  @Description: 根据合作公司id和结算状态查询数据
      */
-    List<PlatformSettlementRecordDto> platformSettlementRecord(@Param("partnerCompaniesId") String partnerCompaniesId, @Param("handlingFeesStatus") String handlingFeesStatus);
+    List<PlatformSettlementRecordDto> platformSettlementRecord(@Param("partnerCompaniesId") String partnerCompaniesId, @Param("handlingFeesStatus") String handlingFeesStatus,@Param("dockingPerson") String dockingPerson);
 
 
     /***

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

@@ -2991,7 +2991,7 @@ handlingProportion,
         if(insPlyIncomeVo.getHandlingFeesStatus()==null || "".equals(insPlyIncomeVo.getHandlingFeesStatus())){
             throw new SystemException("结算状态 0 未结算 1已结算（handlingFeesStatus）不能为空");
         }
-        return baseMapper.platformSettlementRecord(insPlyIncomeVo.getPartnerCompaniesId(),insPlyIncomeVo.getHandlingFeesStatus());
+        return baseMapper.platformSettlementRecord(insPlyIncomeVo.getPartnerCompaniesId(),insPlyIncomeVo.getHandlingFeesStatus(),insPlyIncomeVo.getDockingPerson());
     }
 
 

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

@@ -33,7 +33,10 @@
                  AND system_name like CONCAT('%', #{vo.systemName}, '%')
              </if>
              <if test="vo.systemCode != null and vo.systemCode != ''">
-                 AND system_name = #{vsystemCode}
+                 AND system_code = #{vo.systemCode}
+             </if>
+             <if test="vo.systemStatus != null and vo.systemStatus != ''">
+                 AND system_status = #{vo.systemStatus}
              </if>
          </where>
          order by create_time  desc

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

@@ -25,17 +25,22 @@
             link.id as id,
             link.sys_id as sysId,
             link.user_id as userId,
+            link.create_time as createTime,
             s.system_name as systemName,
-            su.name as userName
+            s.system_code as systemCode,
+            s.system_status as systemStatus,
+            su.name as userName,
+            su.id as userId
         from  sys_user_link_sys link
         left join sys_sys s  on s.id=link.sys_id
         left join sys_user su on su.id =link.user_id
         <where>
+               1=1
             <if test="vo.systemName != null and vo.systemName != ''">
                 AND s.system_name like CONCAT('%', #{vo.systemName}, '%')
             </if>
             <if test="vo.systemCode != null and vo.systemCode != ''">
-                AND s.system_name = #{vsystemCode}
+                AND s.system_code = #{vo.systemCode}
             </if>
             <if test="vo.userName != null and vo.userName != ''">
                 AND su.name like CONCAT('%', #{vo.userName}, '%')
@@ -63,4 +68,45 @@
         </where>
     </select>
 
+    <select id="checkSys" resultType="com.ydtech.modules.admin.model.po.SysUserLinkSys">
+        select
+        link.id as id,
+        link.sys_id as sysId,
+        link.user_id as userId,
+        s.system_name as systemName,
+        su.name as userName
+        from  sys_user_link_sys link
+        left join sys_sys s  on s.id=link.sys_id
+        left join sys_user su on su.id =link.user_id
+        <where>
+            s.system_status = '1'
+            <if test="userId != null and userId != ''">
+                AND link.id = #{userId}
+            </if>
+            <if test="sysId != null and sysId != ''">
+                AND link.sys_id = #{sysId}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="setByUserIds" resultType="java.lang.String">
+        SELECT
+        a.user_id
+        FROM
+        sys_user_link_sys a
+        LEFT JOIN sys_sys s ON s.id = a.sys_id
+        <where>
+            s.system_status ='1'
+            <if test="userIds != null and userIds != '' and userIds.size() > 0">
+                and a.user_id in
+                <foreach collection="userIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="sysId != null  and  sysId  !=''">
+                and a.sys_id =#{sysId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1978,6 +1978,10 @@
             <if test="handlingFeesStatus !=null  and  handlingFeesStatus  !=''">
                 and a.handling_fees_status =#{handlingFeesStatus}
             </if>
+
+            <if test="dockingPerson !=null  and  dockingPerson  !=''">
+                and pa.docking_person =#{dockingPerson}
+            </if>
         </where>
         group  by  a.settlement_time
     </select>