更改

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java

@@ -49,20 +49,15 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 查询条件", description = "付款信息管理 查询条件")
 public class FinPaymentQuery implements Query {
 
-	@ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
     @ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
+    private String companyName;
-	@ApiModelProperty("开户行")
-    private String bank; // 开户行
     @ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
+    private String receivingAccount;
-	@ApiModelProperty("业务类型key")
-    private String businessTypeKey; // 业务类型key
     @ApiModelProperty("业务类型value")
-    private String businessTypeValue; // 业务类型value
+    private String businessTypeValue;
-    @ApiModelProperty("分公司sid")
+
-    private String useOrgSid; // 分公司sid
+    private String userSid;
-    @ApiModelProperty("分公司名称")
+    private String orgPath;
-    private String useOrgName;
+    private String menuUrl;
+    private String menuSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java

@@ -49,22 +49,18 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 视图数据对象", description = "付款信息管理 视图数据对象")
 public class FinPaymentVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
+    private String companyCode;
     @ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
+    private String companyName;
     @ApiModelProperty("开户行")
-    private String bank; // 开户行
+    private String bank;
     @ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
+    private String receivingAccount;
-	@ApiModelProperty("业务类型key")
-    private String businessTypeKey; // 业务类型key
     @ApiModelProperty("业务类型value")
-    private String businessTypeValue; // 业务类型value
+    private String businessTypeValue;
-    @ApiModelProperty("分公司sid")
+    @ApiModelProperty("备注")
-    private String useOrgSid; // 分公司sid
+    private String remarks;
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java

@@ -54,16 +54,12 @@ import java.util.List;
 @Mapper
 public interface FinPaymentMapper extends BaseMapper<FinPayment> {
 
-	//@Update("update fin_payment set name=#{msg} where id=#{id}")
-	//IPage<FinPaymentVo> voPage(IPage<FinPayment> page, @Param(Constants.WRAPPER) QueryWrapper<FinPayment> qw);
-	
     IPage<FinPaymentVo> selectPageVo(IPage<FinPayment> page, @Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
 
-	List<FinPaymentVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
-	
-	@Select("select * from fin_payment")
-	List<FinPaymentVo> selectListVo();
-
     @Select("select * from fin_payment where useOrgSid = #{useOrgSid}")
     List<FinPaymentDetailsVo> selectByUseOrgSid(String useOrgSid);
+
+    int checkSave(@Param("useOrgSid") String useOrgSid,@Param("companyCode") String companyCode);
+
+    int checkUpdate(@Param("useOrgSid") String useOrgSid,@Param("companyCode") String companyCode, @Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml

@@ -4,10 +4,27 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
-		SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
+		SELECT * FROM fin_payment fp
+		LEFT JOIN anrui_portal.sys_organization as u ON fp.useOrgSid = u.sid
+		<where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
+	<select id="checkSave" resultType="int">
-		SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
+		SELECT
+			COUNT(*)
+		FROM
+			fin_payment
+		WHERE companyCode = #{companyCode}
+		  AND useOrgSid = #{useOrgSid}
+	</select>
+
+	<select id="checkUpdate" resultType="int">
+		SELECT
+			COUNT(*)
+		FROM
+			fin_payment
+		WHERE companyCode = #{companyCode}
+		  AND useOrgSid = #{useOrgSid}
+		  AND sid != #{sid}
 	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.fin.api.finpayment.FinPayment;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
@@ -55,7 +56,7 @@ import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
  * @since 1.0
  */
 @Api(tags = "付款信息管理")
-@RestController("com.yxt.anrui.fin.biz.finpayment.FinPaymentRest")
+@RestController
 @RequestMapping("v1/finpayment")
 public class FinPaymentRest implements FinPaymentFeign {
 
@@ -75,14 +76,12 @@ public class FinPaymentRest implements FinPaymentFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody FinPaymentDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        return finPaymentService.saveOrUpdateDto(dto);
-		finPaymentService.saveOrUpdateDto(dto);
-		return rb.success();
     }
 
     @Override
     @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         finPaymentService.delBySids(sids);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpayment;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -60,29 +64,84 @@ import java.util.List;
  */
 @Service
 public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinPayment> {
-    private QueryWrapper<FinPayment> createQueryWrapper(FinPaymentQuery query) {
+
-        // todo: 这里根据具体业务调整查询条件
+    @Autowired
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+    private SysUserFeign sysUserFeign;
-        QueryWrapper<FinPayment> qw = new QueryWrapper<>();
-        return qw;
-    }
 
     public PagerVo<FinPaymentVo> listPageVo(PagerQuery<FinPaymentQuery> pq) {
         FinPaymentQuery query = pq.getParams();
-        QueryWrapper<FinPayment> qw = createQueryWrapper(query);
+        QueryWrapper<FinPayment> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("fp.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<FinPaymentVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<FinPaymentVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getCompanyName())) {
+            qw.like("fp.companyName", query.getCompanyName());
+        }
+        if (StringUtils.isNotBlank(query.getReceivingAccount())) {
+            qw.like("fp.receivingAccount", query.getReceivingAccount());
+        }
+        if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
+            qw.like("fp.businessTypeValue", query.getBusinessTypeValue());
+        }
         IPage<FinPayment> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinPaymentVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public void saveOrUpdateDto(FinPaymentDto dto) {
+    public ResultBean saveOrUpdateDto(FinPaymentDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            int count = baseMapper.checkSave(dto.getUseOrgSid(), dto.getCompanyCode());
+            if (count > 0) {
+                return rb.setMsg("该分公司下单位编码已存在");
+            }
             this.insertByDto(dto);
-            return;
+            return rb.success();
+        }
+        int count = baseMapper.checkUpdate(dto.getUseOrgSid(), dto.getCompanyCode(), dtoSid);
+        if (count > 0) {
+            return rb.setMsg("该分公司下单位编码已存在");
         }
         this.updateByDto(dto);
+        return rb.success();
     }
 
     public void insertByDto(FinPaymentDto dto) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java

@@ -60,7 +60,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyF
  * @since 1.0
  */
 @Api(tags = "逾期催收申请")
-@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyRest")
+@RestController
 @RequestMapping("v1/loanbecollectionapply")
 public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {