yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

厂家认款通过接口修改

master
dimengzhe 3 years ago
parent
4e16b3603d
commit
d59031a292
7 changed files with 125 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorDto.java
  2. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java
  3. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java
  4. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java
  5. 38
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml
  6. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java
  7. 42
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

21
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorDto.java
View File

@ -0,0 +1,21 @@
package com.yxt.anrui.base.api.basemanufactorsubscription;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/7/1 15:47
* @Description
*/
@Data
public class BaseManufactorDto implements Dto {
private static final long serialVersionUID = 1306862380450074162L;
@ApiModelProperty(value = "厂家认款sid")
private String sid;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "备注")
private String remarks;
}

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java
View File

@ -68,9 +68,13 @@ public interface BaseManufactorSubscriptionFeign {
@PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BaseManufactorSubscriptionDto dto, @PathVariable("sid") String sid);
*/
@ApiOperation("厂家认款通过")
/* @ApiOperation("厂家认款通过")
@PostMapping("/adopt/{sid}/{remarks}")
public ResultBean adopt(@PathVariable("sid") String sid, @PathVariable("remarks") String remarks);
public ResultBean adopt(@PathVariable("sid") String sid, @PathVariable("remarks") String remarks);*/
@ApiOperation("厂家认款通过")
@PostMapping("/adopt")
public ResultBean adopt(@RequestBody BaseManufactorDto dto);
/* @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")

11
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java
View File

@ -31,8 +31,6 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* Project: manufactor_subscription(厂商认款) <br/>
* File: BaseManufactorSubscriptionFeignFallback.java <br/>
@ -60,15 +58,20 @@ public class BaseManufactorSubscriptionFeignFallback implements BaseManufactorSu
return ResultBean.fireFail().setMsg("接口manufactor_subscription/basemanufactorsubscription/save无法访问");
}
@Override
public ResultBean adopt(BaseManufactorDto dto) {
return null;
}
/* @Override
public ResultBean update(BaseManufactorSubscriptionDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口manufactor_subscription/basemanufactorsubscription/update无法访问");
}*/
@Override
/*@Override
public ResultBean adopt(String sid,String remarks) {
return null;
}
}*/
/* @Override
public ResultBean delBySids(String[] sids) {

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java
View File

@ -26,17 +26,18 @@
package com.yxt.anrui.base.biz.basemanufactorsubscription;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscription;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscription;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
/**
* Project: manufactor_subscription(厂商认款) <br/>
@ -54,19 +55,20 @@ import java.util.List;
@Mapper
public interface BaseManufactorSubscriptionMapper extends BaseMapper<BaseManufactorSubscription> {
//@Update("update base_manufactor_subscription set name=#{msg} where id=#{id}")
//IPage<BaseManufactorSubscriptionVo> voPage(IPage<BaseManufactorSubscription> page, @Param(Constants.WRAPPER) QueryWrapper<BaseManufactorSubscription> qw);
IPage<BaseManufactorSubscriptionVo> selectPageVo(IPage<BaseManufactorSubscription> page, @Param(Constants.WRAPPER) Wrapper<BaseManufactorSubscription> qw);
List<BaseManufactorSubscriptionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseManufactorSubscription> qw);
@Select("select * from base_manufactor_subscription")
List<BaseManufactorSubscriptionVo> selectListVo();
//@Update("update base_manufactor_subscription set name=#{msg} where id=#{id}")
//IPage<BaseManufactorSubscriptionVo> voPage(IPage<BaseManufactorSubscription> page, @Param(Constants.WRAPPER) QueryWrapper<BaseManufactorSubscription> qw);
IPage<BaseManufactorSubscriptionVo> selectPageVo(IPage<BaseManufactorSubscription> page, @Param(Constants.WRAPPER) Wrapper<BaseManufactorSubscription> qw);
List<BaseManufactorSubscriptionVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseManufactorSubscription> qw);
@Select("select * from base_manufactor_subscription")
List<BaseManufactorSubscriptionVo> selectListVo();
@Update("update base_manufactor_subscription set state = 1,remarks = #{remarks} where sid = #{sid}")
int adopt(@Param("sid") String sid,@Param("remarks") String remarks);
/*@Update("update base_manufactor_subscription set state = 1,remarks = #{remarks} where sid = #{sid}")
int adopt(@Param("sid") String sid,@Param("remarks") String remarks);*/
int adopt(Map<String, Object> map);
@Update("update base_manufactor_subscription set witMatUrl = #{filePath} where sid = #{sid}")
int updateWitMatUrl(@Param("filePath") String filePath,@Param("sid") String sid);
@Update("update base_manufactor_subscription set witMatUrl = #{filePath} where sid = #{sid}")
int updateWitMatUrl(@Param("filePath") String filePath, @Param("sid") String sid);
}

38
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml
View File

@ -1,13 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo">
SELECT * FROM base_manufactor_subscription <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo">
SELECT * FROM base_manufactor_subscription <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo">
SELECT *
FROM base_manufactor_subscription
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo">
SELECT *
FROM base_manufactor_subscription
<where>
${ew.sqlSegment}
</where>
</select>
<update id="adopt">
update base_manufactor_subscription set subscriptionPeo = #{subscriptionPeo}
, subscriptionDate = #{subscriptionDate}
, state = 1
<if test="remarks != null and remarks != ''">
, remarks=#{remarks}
</if>
where sid = #{sid}
</update>
</mapper>

14
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java
View File

@ -25,10 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.biz.basemanufactorsubscription;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionQuery;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo;
import com.yxt.anrui.base.api.basemanufactorsubscription.*;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
@ -85,6 +82,11 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio
return baseManufactorSubscriptionService.saveDto(dto);
}
@Override
public ResultBean adopt(BaseManufactorDto dto) {
return baseManufactorSubscriptionService.adopt(dto);
}
/*@Override
@ApiOperation("修改保存")
@PostMapping("/update/{sid}")
@ -94,10 +96,10 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio
return rb.success();
}*/
@Override
/* @Override
public ResultBean adopt(String sid, String remarks) {
return baseManufactorSubscriptionService.adopt(sid, remarks);
}
}*/
/*@Override
@ApiOperation("根据sid批量删除")

42
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
View File

@ -26,12 +26,13 @@
package com.yxt.anrui.base.biz.basemanufactorsubscription;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscription;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionQuery;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo;
import com.yxt.anrui.base.api.basemanufactorsubscription.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -43,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* Project: manufactor_subscription(厂商认款) <br/>
@ -62,6 +64,11 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
/* public PagerVo<BaseManufactorSubscription> listPage(PagerQuery<BaseManufactorSubscriptionQuery> pq) {
BaseManufactorSubscriptionQuery query = pq.getParams();
@ -146,7 +153,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
return vo;
}*/
public ResultBean adopt(String sid, String remarks) {
/* public ResultBean adopt(String sid, String remarks) {
ResultBean rb = ResultBean.fireFail();
BaseManufactorSubscription baseManufactorSubscription = fetchBySid(sid);
String witMatUrl = baseManufactorSubscription.getWitMatUrl();
@ -158,7 +165,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
return rb.setMsg("未通过");
}
return rb.success().setMsg("已通过");
}
}*/
public int updateWitMatUrl(String filePath, String sid) {
return baseMapper.updateWitMatUrl(filePath, sid);
@ -171,4 +178,27 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
baseMapper.insert(baseManufactorSubscription);
return rb.success();
}
public ResultBean adopt(BaseManufactorDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseManufactorSubscription baseManufactorSubscription = fetchBySid(dto.getSid());
if (baseManufactorSubscription == null) {
return rb.setMsg("该数据不存在");
}
String witMatUrl = baseManufactorSubscription.getWitMatUrl();
if (StringUtils.isBlank(witMatUrl)) {
return rb.setMsg("请优先上传见证材料");
}
Map<String, Object> map = BeanUtil.beanToMap(dto);
//根据用户sid查询名称
ResultBean<SysUserVo> r = sysUserFeign.fetchBySid(dto.getUserSid());
map.put("subscriptionPeo", r.getData().getName());
map.put("subscriptionDate", DateUtil.today());
map.put("sid", dto.getSid());
int i = baseMapper.adopt(map);
if (i == 0) {
return rb.setMsg("操作失败");
}
return rb.success().setMsg("操作成功");
}
}
Write Preview
Loading…
Cancel
Save