费用申请编辑初始化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDetailsVo.java

@@ -27,11 +27,13 @@ package com.yxt.anrui.fin.api.fincostapply;
 
 
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinCostapplyVo.java <br/>
@@ -62,7 +64,7 @@ public class FinCostapplyDetailsVo implements Vo {
     private String costTitleKey;
     @ApiModelProperty("费用名称Value")
     private String costTitleValue;
-    @ApiModelProperty("申请费用,元，小数点2位")
+    @ApiModelProperty("申请费用,元")
     private String cost;
     @ApiModelProperty("使用方式key,先预支/先垫付，先预支的需要生成财务待支付记录。先垫付的，等报销时，在生成待支付记录。")
     private String useTypeKey;
@@ -79,5 +81,7 @@ public class FinCostapplyDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty(value = "实例id")
     private String procInstId;
+    @ApiModelProperty(value = "车架号")
+    private List<String> vinNoList = new ArrayList<>();
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapplyvehicle/FinCostapplyVehicleFeign.java

@@ -55,24 +55,5 @@ import java.util.List;
         path = "v1/fincostapplyvehicle",
         fallback = FinCostapplyVehicleFeignFallback.class)
 public interface FinCostapplyVehicleFeign {
-
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<FinCostapplyVehicleVo>> listPage(@RequestBody PagerQuery<FinCostapplyVehicleQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody FinCostapplyVehicleDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<FinCostapplyVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+    
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapplyvehicle/FinCostapplyVehicleFeignFallback.java

@@ -48,25 +48,5 @@ import java.util.List;
 @Component
 public class FinCostapplyVehicleFeignFallback implements FinCostapplyVehicleFeign {
 
-	@Override
-	public ResultBean<PagerVo<FinCostapplyVehicleVo>> listPage(PagerQuery<FinCostapplyVehicleQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincostapplyvehicle/listPage无法访问");
-	}
 
-	@Override
-	public ResultBean save(FinCostapplyVehicleDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincostapplyvehicle/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincostapplyvehicle/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<FinCostapplyVehicleDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincostapplyvehicle/fetchDetailsBySid无法访问");
-	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -181,7 +181,12 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
     }
 
     public FinCostapplyDetailsVo fetchDetailsVoBySid(String sid) {
-        return baseMapper.fetchDetailsVoBySid(sid);
+        FinCostapplyDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid);
+        if (vo.getIsVeh() == 1) {
+            List<String> vinNoList = finCostapplyVehicleService.selectByApplySid(sid);
+            vo.setVinNoList(vinNoList);
+        }
+        return vo;
     }
 
     /**

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapplyvehicle/FinCostapplyVehicleMapper.java

@@ -25,15 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.fincostapplyvehicle;
 
-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.toolkit.Constants;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.fincostapplyvehicle.FinCostapplyVehicle;
 import com.yxt.anrui.fin.api.fincostapplyvehicle.FinCostapplyVehicleVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -53,15 +49,7 @@ import java.util.List;
 @Mapper
 public interface FinCostapplyVehicleMapper extends BaseMapper<FinCostapplyVehicle> {
 
-	//@Update("update fin_costapply_vehicle set name=#{msg} where id=#{id}")
-	//IPage<FinCostapplyVehicleVo> voPage(IPage<FinCostapplyVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<FinCostapplyVehicle> qw);
-	
-	IPage<FinCostapplyVehicleVo> selectPageVo(IPage<FinCostapplyVehicle> page, @Param(Constants.WRAPPER) Wrapper<FinCostapplyVehicle> qw);
-	
-	List<FinCostapplyVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCostapplyVehicle> qw);
-	
-	@Select("select * from fin_costapply_vehicle")
-	List<FinCostapplyVehicleVo> selectListVo();
-
     int deleteByMainSid(String dtoSid);
+
+    List<String> selectByApplySid(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapplyvehicle/FinCostapplyVehicleMapper.xml

@@ -24,4 +24,10 @@
         from fin_costapply_vehicle
         where mainSid = #{dtoSid}
     </delete>
+
+    <select id="selectByApplySid" resultType="java.lang.String">
+        select vinNo
+        from fin_costapply_vehicle
+        where mainSid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapplyvehicle/FinCostapplyVehicleRest.java

@@ -25,14 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.fincostapplyvehicle;
 
-import com.yxt.anrui.fin.api.fincostapplyvehicle.*;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.fin.api.fincostapplyvehicle.FinCostapplyVehicleFeign;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-fin(财务) <br/>
@@ -52,42 +48,5 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/fincostapplyvehicle")
 public class FinCostapplyVehicleRest implements FinCostapplyVehicleFeign {
 
-	@Autowired
-	private FinCostapplyVehicleService finCostapplyVehicleService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<FinCostapplyVehicleVo>> listPage(@RequestBody PagerQuery<FinCostapplyVehicleQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<FinCostapplyVehicleVo> pv = finCostapplyVehicleService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody FinCostapplyVehicleDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		finCostapplyVehicleService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		finCostapplyVehicleService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinCostapplyVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		FinCostapplyVehicleDetailsVo vo = finCostapplyVehicleService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapplyvehicle/FinCostapplyVehicleService.java

@@ -26,14 +26,9 @@
 package com.yxt.anrui.fin.biz.fincostapplyvehicle;
 
 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.fincostapplyvehicle.*;
+import com.yxt.anrui.fin.api.fincostapplyvehicle.FinCostapplyVehicle;
+import com.yxt.anrui.fin.api.fincostapplyvehicle.FinCostapplyVehicleDetailsVo;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -54,62 +49,37 @@ import java.util.List;
  */
 @Service
 public class FinCostapplyVehicleService extends MybatisBaseService<FinCostapplyVehicleMapper, FinCostapplyVehicle> {
-	private QueryWrapper<FinCostapplyVehicle> createQueryWrapper(FinCostapplyVehicleQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<FinCostapplyVehicle> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<FinCostapplyVehicleVo> listPageVo(PagerQuery<FinCostapplyVehicleQuery> pq) {
-		FinCostapplyVehicleQuery query = pq.getParams();
-		QueryWrapper<FinCostapplyVehicle> qw = createQueryWrapper(query);
-		IPage<FinCostapplyVehicle> page = PagerUtil.queryToPage(pq);
-		IPage<FinCostapplyVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<FinCostapplyVehicleVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(FinCostapplyVehicleDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(FinCostapplyVehicleDto dto){
-		FinCostapplyVehicle entity = new FinCostapplyVehicle();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(FinCostapplyVehicleDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		FinCostapplyVehicle entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public FinCostapplyVehicleDetailsVo fetchDetailsVoBySid(String sid){
-		FinCostapplyVehicle entity = fetchBySid(sid);
-		FinCostapplyVehicleDetailsVo vo = new FinCostapplyVehicleDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+    
 
-	public int deleteByMainSid(String dtoSid) {
-		return baseMapper.deleteByMainSid(dtoSid);
-	}
+    /**
+     * 删除费用申请的车辆
+     *
+     * @param dtoSid 费用申请sid
+     * @return
+     */
+    public int deleteByMainSid(String dtoSid) {
+        return baseMapper.deleteByMainSid(dtoSid);
+    }
 
-	public void deleteByApplySid(String[] sids) {
-		List<String> stringList = Arrays.asList(sids);
-		for (int i = 0; i < stringList.size(); i++) {
-			baseMapper.deleteByMainSid(stringList.get(i));
-		}
-	}
+    /**
+     * 批量删除费用申请的车辆
+     *
+     * @param sids
+     */
+    public void deleteByApplySid(String[] sids) {
+        List<String> stringList = Arrays.asList(sids);
+        for (int i = 0; i < stringList.size(); i++) {
+            baseMapper.deleteByMainSid(stringList.get(i));
+        }
+    }
+
+    /**
+     * 根据费用申请sid查询车架号数组
+     *
+     * @param sid 费用申请sid
+     * @return
+     */
+    public List<String> selectByApplySid(String sid) {
+        return baseMapper.selectByApplySid(sid);
+    }
 }