Browse Source

验车单项目管理分页查询、新增修改保存、批量删除、编辑初始化

master
dimengzhe 3 years ago
parent
commit
cf5305c120
  1. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailDetailsVo.java
  2. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailDto.java
  3. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailFeign.java
  4. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailFeignFallback.java
  5. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDetailsVo.java
  6. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDto.java
  7. 30
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempFeign.java
  8. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempFeignFallback.java
  9. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitem.java
  10. 21
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDetailsVo.java
  11. 17
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDto.java
  12. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemFeign.java
  13. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemFeignFallback.java
  14. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemQuery.java
  15. 14
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemVo.java
  16. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailMapper.java
  17. 26
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailMapper.xml
  18. 37
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailRest.java
  19. 66
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailService.java
  20. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.java
  21. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml
  22. 55
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempRest.java
  23. 78
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempService.java
  24. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.java
  25. 21
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml
  26. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemRest.java
  27. 111
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemService.java

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailDetailsVo.java

@ -50,8 +50,6 @@ import lombok.Data;
public class ScmVehicleInspectdetailDetailsVo implements Vo { public class ScmVehicleInspectdetailDetailsVo implements Vo {
private static final long serialVersionUID = 1345926915330099698L; private static final long serialVersionUID = 1345926915330099698L;
@ApiModelProperty("检查项目sid")
private String itemSid;
@ApiModelProperty("内容") @ApiModelProperty("内容")
private String itemContent; private String itemContent;
@ApiModelProperty("序号") @ApiModelProperty("序号")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailDto.java

@ -50,10 +50,7 @@ import lombok.Data;
public class ScmVehicleInspectdetailDto implements Dto { public class ScmVehicleInspectdetailDto implements Dto {
private static final long serialVersionUID = -5605156695246484541L; private static final long serialVersionUID = -5605156695246484541L;
private String sid;
@ApiModelProperty("检查项目sid")
private String itemSid;
@ApiModelProperty("内容") @ApiModelProperty("内容")
private String itemContent; private String itemContent;
@ApiModelProperty("序号") @ApiModelProperty("序号")

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailFeign.java

@ -56,23 +56,5 @@ import java.util.List;
fallback = ScmVehicleInspectdetailFeignFallback.class) fallback = ScmVehicleInspectdetailFeignFallback.class)
public interface ScmVehicleInspectdetailFeign { public interface ScmVehicleInspectdetailFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<ScmVehicleInspectdetailVo>> listPage(@RequestBody PagerQuery<ScmVehicleInspectdetailQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehicleInspectdetailDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmVehicleInspectdetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
} }

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectdetail/ScmVehicleInspectdetailFeignFallback.java

@ -48,25 +48,5 @@ import java.util.List;
@Component @Component
public class ScmVehicleInspectdetailFeignFallback implements ScmVehicleInspectdetailFeign { public class ScmVehicleInspectdetailFeignFallback implements ScmVehicleInspectdetailFeign {
@Override
public ResultBean<PagerVo<ScmVehicleInspectdetailVo>> listPage(PagerQuery<ScmVehicleInspectdetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehicleinspectdetail/listPage无法访问");
}
@Override
public ResultBean save(ScmVehicleInspectdetailDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehicleinspectdetail/save无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehicleinspectdetail/delBySids无法访问");
}
@Override
public ResultBean<ScmVehicleInspectdetailDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehicleinspectdetail/fetchDetailsBySid无法访问");
}
} }

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDetailsVo.java

@ -49,10 +49,7 @@ import lombok.Data;
@ApiModel(value = "验车检查项目照片示例 视图数据详情", description = "验车检查项目照片示例 视图数据详情") @ApiModel(value = "验车检查项目照片示例 视图数据详情", description = "验车检查项目照片示例 视图数据详情")
public class ScmVehicleInspectimgtempDetailsVo implements Vo { public class ScmVehicleInspectimgtempDetailsVo implements Vo {
private static final long serialVersionUID = 5442765103045338274L; private static final long serialVersionUID = 5442765103045338274L;
@ApiModelProperty("检查项目sid")
private String itemSid;
@ApiModelProperty("照片名称") @ApiModelProperty("照片名称")
private String imgTitle; private String imgTitle;
@ApiModelProperty("照片示例") @ApiModelProperty("照片示例")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempDto.java

@ -50,10 +50,6 @@ import lombok.Data;
public class ScmVehicleInspectimgtempDto implements Dto { public class ScmVehicleInspectimgtempDto implements Dto {
private static final long serialVersionUID = 3087036153093807939L; private static final long serialVersionUID = 3087036153093807939L;
private String sid;
@ApiModelProperty("检查项目sid")
private String itemSid;
@ApiModelProperty("照片名称") @ApiModelProperty("照片名称")
private String imgTitle; private String imgTitle;
@ApiModelProperty("照片示例") @ApiModelProperty("照片示例")

30
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempFeign.java

@ -25,15 +25,13 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.api.scmvehicleinspectimgtemp; package com.yxt.anrui.scm.api.scmvehicleinspectimgtemp;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List; import org.springframework.web.bind.annotation.ResponseBody;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
@ -55,24 +53,6 @@ import java.util.List;
path = "v1/scmvehicleinspectimgtemp", path = "v1/scmvehicleinspectimgtemp",
fallback = ScmVehicleInspectimgtempFeignFallback.class) fallback = ScmVehicleInspectimgtempFeignFallback.class)
public interface ScmVehicleInspectimgtempFeign { public interface ScmVehicleInspectimgtempFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<ScmVehicleInspectimgtempVo>> listPage(@RequestBody PagerQuery<ScmVehicleInspectimgtempQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmVehicleInspectimgtempDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmVehicleInspectimgtempDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
} }

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempFeignFallback.java

@ -25,13 +25,8 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.api.scmvehicleinspectimgtemp; package com.yxt.anrui.scm.api.scmvehicleinspectimgtemp;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectimgtempFeignFallback.java <br/> * File: ScmVehicleInspectimgtempFeignFallback.java <br/>
@ -48,25 +43,4 @@ import java.util.List;
@Component @Component
public class ScmVehicleInspectimgtempFeignFallback implements ScmVehicleInspectimgtempFeign { public class ScmVehicleInspectimgtempFeignFallback implements ScmVehicleInspectimgtempFeign {
@Override
public ResultBean<PagerVo<ScmVehicleInspectimgtempVo>> listPage(PagerQuery<ScmVehicleInspectimgtempQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehicleinspectimgtemp/listPage无法访问");
}
@Override
public ResultBean save(ScmVehicleInspectimgtempDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehicleinspectimgtemp/save无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehicleinspectimgtemp/delBySids无法访问");
}
@Override
public ResultBean<ScmVehicleInspectimgtempDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehicleinspectimgtemp/fetchDetailsBySid无法访问");
}
} }

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitem.java

@ -57,6 +57,8 @@ public class ScmVehicleInspectitem extends BaseEntity {
@ApiModelProperty("是否上传照片:是1,否0") @ApiModelProperty("是否上传照片:是1,否0")
private Integer isImg; private Integer isImg;
@ApiModelProperty("检查结果:是/否") @ApiModelProperty("检查结果:是/否")
private Integer result; private String result;
@ApiModelProperty(value = "图标地址")
private String iconUrl;
} }

21
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDetailsVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmvehicleinspectitem; package com.yxt.anrui.scm.api.scmvehicleinspectitem;
import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemVo.java <br/> * File: ScmVehicleInspectitemVo.java <br/>
@ -49,15 +52,21 @@ import lombok.Data;
@ApiModel(value = "验车检查项目 视图数据详情", description = "验车检查项目 视图数据详情") @ApiModel(value = "验车检查项目 视图数据详情", description = "验车检查项目 视图数据详情")
public class ScmVehicleInspectitemDetailsVo implements Vo { public class ScmVehicleInspectitemDetailsVo implements Vo {
private static final long serialVersionUID = 8436497128772677861L; private static final long serialVersionUID = 8436497128772677861L;
@ApiModelProperty("序号") @ApiModelProperty("序号")
private Integer sortNo; private Integer sortNo;
@ApiModelProperty("项目名称") @ApiModelProperty("项目名称")
private String item; private String item;
@ApiModelProperty("是否上传照片:是1,否0") @ApiModelProperty("是否上传照片:是1,否0")
private Integer isImg; private Integer isImg;
@ApiModelProperty("检查结果:是/否") @ApiModelProperty("检查结果:是/否")
private Integer result; private String result;
@ApiModelProperty(value = "照片说明")
private String remarks;
@ApiModelProperty(value = "项目内容")
private List<ScmVehicleInspectdetailDetailsVo> inspectdetail;
@ApiModelProperty(value = "照片模板")
private List<ScmVehicleInspectimgtempDetailsVo> inspectimgtemp;
} }

17
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemDto.java

@ -26,12 +26,16 @@
package com.yxt.anrui.scm.api.scmvehicleinspectitem; package com.yxt.anrui.scm.api.scmvehicleinspectitem;
import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDto;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemDto.java <br/> * File: ScmVehicleInspectitemDto.java <br/>
@ -59,6 +63,15 @@ public class ScmVehicleInspectitemDto implements Dto {
@ApiModelProperty("是否上传照片:是1,否0") @ApiModelProperty("是否上传照片:是1,否0")
private Integer isImg; private Integer isImg;
@ApiModelProperty("检查结果:是/否") @ApiModelProperty("检查结果:是/否")
private Integer result; private String result;
@ApiModelProperty(value = "图标地址")
private String iconUrl;
@ApiModelProperty(value = "检查项内容")
private List<ScmVehicleInspectdetailDto> inspectdetail = new ArrayList<>();
@ApiModelProperty(value = "照片示例")
private List<ScmVehicleInspectimgtempDto> inspectimgtemp = new ArrayList<>();
} }

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemFeign.java

@ -25,16 +25,14 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.api.scmvehicleinspectitem; package com.yxt.anrui.scm.api.scmvehicleinspectitem;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemFeign.java <br/> * File: ScmVehicleInspectitemFeign.java <br/>
@ -64,7 +62,7 @@ public interface ScmVehicleInspectitemFeign {
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
@ResponseBody @ResponseBody
public ResultBean save(@RequestBody ScmVehicleInspectitemDto dto); public ResultBean<String> save(@RequestBody ScmVehicleInspectitemDto dto);
@ApiOperation("根据sid删除记录") @ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemFeignFallback.java

@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemFeignFallback.java <br/> * File: ScmVehicleInspectitemFeignFallback.java <br/>
@ -55,8 +53,9 @@ public class ScmVehicleInspectitemFeignFallback implements ScmVehicleInspectitem
} }
@Override @Override
public ResultBean save(ScmVehicleInspectitemDto dto) { public ResultBean<String> save(ScmVehicleInspectitemDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehicleinspectitem/save无法访问"); ResultBean<String> rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmvehicleinspectitem/save无法访问");
} }
@Override @Override

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemQuery.java

@ -50,13 +50,9 @@ import lombok.Data;
public class ScmVehicleInspectitemQuery implements Query { public class ScmVehicleInspectitemQuery implements Query {
private static final long serialVersionUID = 1807266511712102757L; private static final long serialVersionUID = 1807266511712102757L;
@ApiModelProperty("序号")
private Integer sortNo;
@ApiModelProperty("项目名称") @ApiModelProperty("项目名称")
private String item; private String item;
@ApiModelProperty("是否上传照片:是1,否0") @ApiModelProperty("是否上传照片:是1,否0")
private Integer isImg; private Integer isImg;
@ApiModelProperty("检查结果:是/否")
private Integer result;
} }

14
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinspectitem/ScmVehicleInspectitemVo.java

@ -49,15 +49,17 @@ import lombok.Data;
@ApiModel(value = "验车检查项目 视图数据对象", description = "验车检查项目 视图数据对象") @ApiModel(value = "验车检查项目 视图数据对象", description = "验车检查项目 视图数据对象")
public class ScmVehicleInspectitemVo implements Vo { public class ScmVehicleInspectitemVo implements Vo {
private static final long serialVersionUID = 299564160231139031L; private static final long serialVersionUID = 299564160231139031L;
@ApiModelProperty(value = "sid")
private String sid;
@ApiModelProperty("项目名称")
private String item;
@ApiModelProperty("序号") @ApiModelProperty("序号")
private Integer sortNo; private Integer sortNo;
@ApiModelProperty("项目名称")
private String item; @ApiModelProperty("是否上传照片:是1,否0")
@ApiModelProperty("是否上传照片:是1,否0")
private Integer isImg; private Integer isImg;
@ApiModelProperty("检查结果:是/否") @ApiModelProperty(value = "照片说明")
private Integer result; private String remarks;
} }

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailMapper.java

@ -25,15 +25,10 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmvehicleinspectdetail; package com.yxt.anrui.scm.biz.scmvehicleinspectdetail;
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.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.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetail; import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetail;
import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailVo; import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@ -53,13 +48,8 @@ import java.util.List;
@Mapper @Mapper
public interface ScmVehicleInspectdetailMapper extends BaseMapper<ScmVehicleInspectdetail> { public interface ScmVehicleInspectdetailMapper extends BaseMapper<ScmVehicleInspectdetail> {
//@Update("update scm_vehicle_inspectdetail set name=#{msg} where id=#{id}")
//IPage<ScmVehicleInspectdetailVo> voPage(IPage<ScmVehicleInspectdetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleInspectdetail> qw);
IPage<ScmVehicleInspectdetailVo> selectPageVo(IPage<ScmVehicleInspectdetail> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectdetail> qw);
List<ScmVehicleInspectdetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectdetail> qw); void deleteByItemSid(String dtoSid);
@Select("select * from scm_vehicle_inspectdetail") List<ScmVehicleInspectdetailDetailsVo> selectByItemSid(String sid);
List<ScmVehicleInspectdetailVo> selectListVo();
} }

26
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailMapper.xml

@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmvehicleinspectdetail.ScmVehicleInspectdetailMapper"> <mapper namespace="com.yxt.anrui.scm.biz.scmvehicleinspectdetail.ScmVehicleInspectdetailMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <delete id="deleteByItemSid">
<!-- ${ew.customSqlSegment} --> delete
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailVo"> from scm_vehicle_inspectdetail
SELECT * where itemSid = #{dtoSid}
FROM scm_vehicle_inspectdetail </delete>
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailVo"> <select id="selectByItemSid"
SELECT * resultType="com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDetailsVo">
FROM scm_vehicle_inspectdetail select si.sortNo, si.itemContent
<where> from scm_vehicle_inspectdetail si
${ew.sqlSegment} where itemSid = #{sid}
</where> order by si.sortNo asc
</select> </select>
</mapper> </mapper>

37
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailRest.java

@ -60,42 +60,5 @@ import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailFeig
@RequestMapping("v1/scmvehicleinspectdetail") @RequestMapping("v1/scmvehicleinspectdetail")
public class ScmVehicleInspectdetailRest implements ScmVehicleInspectdetailFeign { public class ScmVehicleInspectdetailRest implements ScmVehicleInspectdetailFeign {
@Autowired
private ScmVehicleInspectdetailService scmVehicleInspectdetailService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmVehicleInspectdetailVo>> listPage(@RequestBody PagerQuery<ScmVehicleInspectdetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmVehicleInspectdetailVo> pv = scmVehicleInspectdetailService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmVehicleInspectdetailDto dto) {
ResultBean rb = ResultBean.fireFail();
scmVehicleInspectdetailService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
scmVehicleInspectdetailService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmVehicleInspectdetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ScmVehicleInspectdetailDetailsVo vo = scmVehicleInspectdetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
} }

66
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectdetail/ScmVehicleInspectdetailService.java

@ -26,16 +26,16 @@
package com.yxt.anrui.scm.biz.scmvehicleinspectdetail; package com.yxt.anrui.scm.biz.scmvehicleinspectdetail;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetail;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectdetail.*; import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDto;
import com.yxt.common.base.service.MybatisBaseService; 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 org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectdetailService.java <br/> * File: ScmVehicleInspectdetailService.java <br/>
@ -52,47 +52,31 @@ import org.springframework.stereotype.Service;
@Service @Service
public class ScmVehicleInspectdetailService extends MybatisBaseService<ScmVehicleInspectdetailMapper, ScmVehicleInspectdetail> { public class ScmVehicleInspectdetailService extends MybatisBaseService<ScmVehicleInspectdetailMapper, ScmVehicleInspectdetail> {
public PagerVo<ScmVehicleInspectdetailVo> listPageVo(PagerQuery<ScmVehicleInspectdetailQuery> pq) { public void save(List<ScmVehicleInspectdetailDto> inspectdetail, String sid) {
ScmVehicleInspectdetailQuery query = pq.getParams(); inspectdetail.removeAll(Collections.singleton(null));
QueryWrapper<ScmVehicleInspectdetail> qw = new QueryWrapper<>(); if (!inspectdetail.isEmpty()) {
if (query != null) { inspectdetail.stream().forEach(item -> {
ScmVehicleInspectdetail scmVehicleInspectdetail = new ScmVehicleInspectdetail();
BeanUtil.copyProperties(item, scmVehicleInspectdetail);
scmVehicleInspectdetail.setItemSid(sid);
baseMapper.insert(scmVehicleInspectdetail);
});
} }
IPage<ScmVehicleInspectdetail> page = PagerUtil.queryToPage(pq);
IPage<ScmVehicleInspectdetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmVehicleInspectdetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
} }
public void saveOrUpdateDto(ScmVehicleInspectdetailDto dto) { public void deleteByItemSid(String dtoSid) {
String dtoSid = dto.getSid(); baseMapper.deleteByItemSid(dtoSid);
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
} }
public void insertByDto(ScmVehicleInspectdetailDto dto) { public List<ScmVehicleInspectdetailDetailsVo> selectByItemSid(String sid) {
ScmVehicleInspectdetail entity = new ScmVehicleInspectdetail(); return baseMapper.selectByItemSid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
} }
public void updateByDto(ScmVehicleInspectdetailDto dto) { public void deleteAllByItemSid(String[] sids) {
String dtoSid = dto.getSid(); List<String> sidList = Arrays.asList(sids);
if (StringUtils.isBlank(dtoSid)) { sidList.stream().forEach(item -> {
return; baseMapper.deleteByItemSid(item);
} });
ScmVehicleInspectdetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmVehicleInspectdetailDetailsVo fetchDetailsVoBySid(String sid) {
ScmVehicleInspectdetail entity = fetchBySid(sid);
ScmVehicleInspectdetailDetailsVo vo = new ScmVehicleInspectdetailDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
} }
} }

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.java

@ -25,15 +25,11 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp; package com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp;
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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtemp;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtemp;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempVo;
import java.util.List; import java.util.List;
@ -53,13 +49,8 @@ import java.util.List;
@Mapper @Mapper
public interface ScmVehicleInspectimgtempMapper extends BaseMapper<ScmVehicleInspectimgtemp> { public interface ScmVehicleInspectimgtempMapper extends BaseMapper<ScmVehicleInspectimgtemp> {
//@Update("update scm_vehicle_inspectimgtemp set name=#{msg} where id=#{id}")
//IPage<ScmVehicleInspectimgtempVo> voPage(IPage<ScmVehicleInspectimgtemp> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleInspectimgtemp> qw);
IPage<ScmVehicleInspectimgtempVo> selectPageVo(IPage<ScmVehicleInspectimgtemp> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectimgtemp> qw);
List<ScmVehicleInspectimgtempVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectimgtemp> qw); void deleteByItemSid(String dtoSid);
@Select("select * from scm_vehicle_inspectimgtemp") List<ScmVehicleInspectimgtempDetailsVo> selectByItemSid(@Param("sid") String sid, @Param("path") String path);
List<ScmVehicleInspectimgtempVo> selectListVo();
} }

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempMapper.xml

@ -3,19 +3,18 @@
<mapper namespace="com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempMapper"> <mapper namespace="com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempVo">
SELECT *
FROM scm_vehicle_inspectimgtemp
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempVo">
SELECT * <delete id="deleteByItemSid">
FROM scm_vehicle_inspectimgtemp delete
<where> from scm_vehicle_inspectimgtemp
${ew.sqlSegment} where itemSid = #{dtoSid}
</where> </delete>
<select id="selectByItemSid"
resultType="com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo">
select concat(#{path}, st.imgTempUrl) as imgTempUrl, st.imgTitle
from scm_vehicle_inspectimgtemp st
where itemSid = #{sid}
</select> </select>
</mapper> </mapper>

55
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempRest.java

@ -25,22 +25,10 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp; package com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtemp;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempQuery;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDto;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempFeign; import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempFeign;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
@ -60,42 +48,5 @@ import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempFe
@RequestMapping("v1/scmvehicleinspectimgtemp") @RequestMapping("v1/scmvehicleinspectimgtemp")
public class ScmVehicleInspectimgtempRest implements ScmVehicleInspectimgtempFeign { public class ScmVehicleInspectimgtempRest implements ScmVehicleInspectimgtempFeign {
@Autowired
private ScmVehicleInspectimgtempService scmVehicleInspectimgtempService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmVehicleInspectimgtempVo>> listPage(@RequestBody PagerQuery<ScmVehicleInspectimgtempQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmVehicleInspectimgtempVo> pv = scmVehicleInspectimgtempService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmVehicleInspectimgtempDto dto) {
ResultBean rb = ResultBean.fireFail();
scmVehicleInspectimgtempService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
scmVehicleInspectimgtempService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmVehicleInspectimgtempDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ScmVehicleInspectimgtempDetailsVo vo = scmVehicleInspectimgtempService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
} }

78
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectimgtemp/ScmVehicleInspectimgtempService.java

@ -26,23 +26,16 @@
package com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp; package com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtemp; import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtemp;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempQuery;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo; import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDto; import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDto;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempFeign; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
@ -60,51 +53,38 @@ import java.util.List;
*/ */
@Service @Service
public class ScmVehicleInspectimgtempService extends MybatisBaseService<ScmVehicleInspectimgtempMapper, ScmVehicleInspectimgtemp> { public class ScmVehicleInspectimgtempService extends MybatisBaseService<ScmVehicleInspectimgtempMapper, ScmVehicleInspectimgtemp> {
private QueryWrapper<ScmVehicleInspectimgtemp> createQueryWrapper(ScmVehicleInspectimgtempQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmVehicleInspectimgtemp> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmVehicleInspectimgtempVo> listPageVo(PagerQuery<ScmVehicleInspectimgtempQuery> pq) { @Autowired
ScmVehicleInspectimgtempQuery query = pq.getParams(); private FileUploadComponent fileUploadComponent;
QueryWrapper<ScmVehicleInspectimgtemp> qw = createQueryWrapper(query);
IPage<ScmVehicleInspectimgtemp> page = PagerUtil.queryToPage(pq);
IPage<ScmVehicleInspectimgtempVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmVehicleInspectimgtempVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmVehicleInspectimgtempDto dto) { public void save(List<ScmVehicleInspectimgtempDto> inspectimgtemp, String sid) {
String dtoSid = dto.getSid(); inspectimgtemp.removeAll(Collections.singleton(null));
if (StringUtils.isBlank(dtoSid)) { if (!inspectimgtemp.isEmpty()) {
this.insertByDto(dto); inspectimgtemp.stream().forEach(item -> {
return; ScmVehicleInspectimgtemp scmVehicleInspectimgtemp = new ScmVehicleInspectimgtemp();
BeanUtil.copyProperties(item, scmVehicleInspectimgtemp);
if (scmVehicleInspectimgtemp.getImgTempUrl().contains(fileUploadComponent.getUrlPrefix())) {
scmVehicleInspectimgtemp.setImgTempUrl(scmVehicleInspectimgtemp.getImgTempUrl().replace(fileUploadComponent.getUrlPrefix(), ""));
}
scmVehicleInspectimgtemp.setItemSid(sid);
baseMapper.insert(scmVehicleInspectimgtemp);
});
} }
this.updateByDto(dto);
} }
public void insertByDto(ScmVehicleInspectimgtempDto dto) { public void deleteByItemSid(String dtoSid) {
ScmVehicleInspectimgtemp entity = new ScmVehicleInspectimgtemp(); baseMapper.deleteByItemSid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
} }
public void updateByDto(ScmVehicleInspectimgtempDto dto) { public List<ScmVehicleInspectimgtempDetailsVo> selectByItemSid(String sid) {
String dtoSid = dto.getSid(); String path = fileUploadComponent.getUrlPrefix();
if (StringUtils.isBlank(dtoSid)) { return baseMapper.selectByItemSid(sid, path);
return;
}
ScmVehicleInspectimgtemp entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
} }
public ScmVehicleInspectimgtempDetailsVo fetchDetailsVoBySid(String sid) { public void deleteAllByItemSid(String[] sids) {
ScmVehicleInspectimgtemp entity = fetchBySid(sid); List<String> sidList = Arrays.asList(sids);
ScmVehicleInspectimgtempDetailsVo vo = new ScmVehicleInspectimgtempDetailsVo(); sidList.stream().forEach(item -> {
BeanUtil.copyProperties(entity, vo); baseMapper.deleteByItemSid(item);
return vo; });
} }
} }

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.java

@ -26,16 +26,14 @@
package com.yxt.anrui.scm.biz.scmvehicleinspectitem; package com.yxt.anrui.scm.biz.scmvehicleinspectitem;
import com.baomidou.mybatisplus.core.conditions.Wrapper; 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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; 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.scm.api.scmvehicleinspectitem.ScmVehicleInspectitem; import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitem;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemVo; import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemVo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List; import org.apache.ibatis.annotations.Param;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
@ -53,13 +51,7 @@ import java.util.List;
@Mapper @Mapper
public interface ScmVehicleInspectitemMapper extends BaseMapper<ScmVehicleInspectitem> { public interface ScmVehicleInspectitemMapper extends BaseMapper<ScmVehicleInspectitem> {
//@Update("update scm_vehicle_inspectitem set name=#{msg} where id=#{id}")
//IPage<ScmVehicleInspectitemVo> voPage(IPage<ScmVehicleInspectitem> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehicleInspectitem> qw);
IPage<ScmVehicleInspectitemVo> selectPageVo(IPage<ScmVehicleInspectitem> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectitem> qw); IPage<ScmVehicleInspectitemVo> selectPageVo(IPage<ScmVehicleInspectitem> page, @Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectitem> qw);
List<ScmVehicleInspectitemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleInspectitem> qw); ScmVehicleInspectitemDetailsVo fetchDetailsVoBySid(String sid);
@Select("select * from scm_vehicle_inspectitem")
List<ScmVehicleInspectitemVo> selectListVo();
} }

21
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml

@ -4,18 +4,23 @@
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemVo"> <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemVo">
SELECT * SELECT si.sid,
FROM scm_vehicle_inspectitem si.item,
si.sortNo,
case si.isImg
when 1 then '是'
when 0 then '否' end as isImg,
si.remarks
FROM scm_vehicle_inspectitem si
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemVo"> <select id="fetchDetailsVoBySid"
SELECT * resultType="com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemDetailsVo">
FROM scm_vehicle_inspectitem select si.sortNo, si.item, si.isImg, si.remarks, si.result
<where> from scm_vehicle_inspectitem si
${ew.sqlSegment} where sid = #{sid}
</where>
</select> </select>
</mapper> </mapper>

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemRest.java

@ -25,23 +25,16 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmvehicleinspectitem; package com.yxt.anrui.scm.biz.scmvehicleinspectitem;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.*;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitem;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemQuery;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemVo;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemDto;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemFeign;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemFeignFallback.java <br/> * File: ScmVehicleInspectitemFeignFallback.java <br/>
@ -56,7 +49,7 @@ import com.yxt.anrui.scm.api.scmvehicleinspectitem.ScmVehicleInspectitemFeign;
* @since 1.0 * @since 1.0
*/ */
@Api(tags = "验车检查项目") @Api(tags = "验车检查项目")
@RestController("com.yxt.anrui.scm.biz.scmvehicleinspectitem.ScmVehicleInspectitemRest") @Controller
@RequestMapping("v1/scmvehicleinspectitem") @RequestMapping("v1/scmvehicleinspectitem")
public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign { public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign {
@ -75,10 +68,8 @@ public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign {
@Override @Override
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody ScmVehicleInspectitemDto dto) { public ResultBean<String> save(@RequestBody ScmVehicleInspectitemDto dto) {
ResultBean rb = ResultBean.fireFail(); return scmVehicleInspectitemService.saveOrUpdateDto(dto);
scmVehicleInspectitemService.saveOrUpdateDto(dto);
return rb.success();
} }
@Override @Override
@ -86,7 +77,7 @@ public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign {
@PostMapping("/delBySids") @PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) { public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
scmVehicleInspectitemService.delBySids(sids); scmVehicleInspectitemService.deleteAllBySid(sids);
return rb.success(); return rb.success();
} }
@ -94,8 +85,6 @@ public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign {
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmVehicleInspectitemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) { public ResultBean<ScmVehicleInspectitemDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); return scmVehicleInspectitemService.fetchDetailsVoBySid(sid);
ScmVehicleInspectitemDetailsVo vo = scmVehicleInspectitemService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
} }
} }

111
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemService.java

@ -28,14 +28,25 @@ package com.yxt.anrui.scm.biz.scmvehicleinspectitem;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectdetail.ScmVehicleInspectdetailDto;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDetailsVo;
import com.yxt.anrui.scm.api.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempDto;
import com.yxt.anrui.scm.api.scmvehicleinspectitem.*; import com.yxt.anrui.scm.api.scmvehicleinspectitem.*;
import com.yxt.anrui.scm.biz.scmvehicleinspectdetail.ScmVehicleInspectdetailService;
import com.yxt.anrui.scm.biz.scmvehicleinspectimgtemp.ScmVehicleInspectimgtempService;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/** /**
* Project: anrui-scm(供应链) <br/> * Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemService.java <br/> * File: ScmVehicleInspectitemService.java <br/>
@ -51,51 +62,91 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class ScmVehicleInspectitemService extends MybatisBaseService<ScmVehicleInspectitemMapper, ScmVehicleInspectitem> { public class ScmVehicleInspectitemService extends MybatisBaseService<ScmVehicleInspectitemMapper, ScmVehicleInspectitem> {
private QueryWrapper<ScmVehicleInspectitem> createQueryWrapper(ScmVehicleInspectitemQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmVehicleInspectitem> qw = new QueryWrapper<>();
return qw;
}
@Autowired
private ScmVehicleInspectdetailService scmVehicleInspectdetailService;
@Autowired
private ScmVehicleInspectimgtempService scmVehicleInspectimgtempService;
/**
* 分页列表
*
* @param pq
* @return
*/
public PagerVo<ScmVehicleInspectitemVo> listPageVo(PagerQuery<ScmVehicleInspectitemQuery> pq) { public PagerVo<ScmVehicleInspectitemVo> listPageVo(PagerQuery<ScmVehicleInspectitemQuery> pq) {
ScmVehicleInspectitemQuery query = pq.getParams(); ScmVehicleInspectitemQuery params = pq.getParams();
QueryWrapper<ScmVehicleInspectitem> qw = createQueryWrapper(query); QueryWrapper<ScmVehicleInspectitem> qw = new QueryWrapper<>();
if (params != null) {
//项目名称
if (StringUtils.isNotBlank(params.getItem())) {
qw.like("si.item", params.getItem());
}
//是否上传照片
if (params.getIsImg() != null) {
qw.eq("si.isImg", params.getIsImg());
}
}
IPage<ScmVehicleInspectitem> page = PagerUtil.queryToPage(pq); IPage<ScmVehicleInspectitem> page = PagerUtil.queryToPage(pq);
IPage<ScmVehicleInspectitemVo> pagging = baseMapper.selectPageVo(page, qw); IPage<ScmVehicleInspectitemVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmVehicleInspectitemVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<ScmVehicleInspectitemVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public void saveOrUpdateDto(ScmVehicleInspectitemDto dto) { public ResultBean<String> saveOrUpdateDto(ScmVehicleInspectitemDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
List<ScmVehicleInspectimgtempDto> inspectimgtemp = dto.getInspectimgtemp();
List<ScmVehicleInspectdetailDto> inspectdetail = dto.getInspectdetail();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto); ScmVehicleInspectitem scmVehicleInspectitem = new ScmVehicleInspectitem();
return; BeanUtil.copyProperties(dto, scmVehicleInspectitem, "sid");
if ("1".equals(scmVehicleInspectitem.getIsImg())) {//上传图片
scmVehicleInspectimgtempService.save(inspectimgtemp, scmVehicleInspectitem.getSid());
}
scmVehicleInspectdetailService.save(inspectdetail, scmVehicleInspectitem.getSid());
baseMapper.insert(scmVehicleInspectitem);
} else {
ScmVehicleInspectitem scmVehicleInspectitem = fetchBySid(dtoSid);
if (scmVehicleInspectitem == null) {
return rb.setMsg("该项目不存在");
}
BeanUtil.copyProperties(dto, scmVehicleInspectitem);
//删除项目内容
scmVehicleInspectdetailService.deleteByItemSid(dtoSid);
//新增项目内容
scmVehicleInspectdetailService.save(inspectdetail, scmVehicleInspectitem.getSid());
//是否有照片,若有,则删除照片,再新增,若没有则直接删除
scmVehicleInspectimgtempService.deleteByItemSid(dtoSid);
if ("1".equals(scmVehicleInspectitem.getIsImg())) {
scmVehicleInspectimgtempService.save(inspectimgtemp, scmVehicleInspectitem.getSid());
}
baseMapper.updateById(scmVehicleInspectitem);
} }
this.updateByDto(dto); return rb.success().setData(dtoSid);
} }
public void insertByDto(ScmVehicleInspectitemDto dto) { public ResultBean<ScmVehicleInspectitemDetailsVo> fetchDetailsVoBySid(String sid) {
ScmVehicleInspectitem entity = new ScmVehicleInspectitem(); ResultBean<ScmVehicleInspectitemDetailsVo> rb = ResultBean.fireFail();
BeanUtil.copyProperties(dto, entity, "id", "sid"); ScmVehicleInspectitem entity = fetchBySid(sid);
baseMapper.insert(entity); if (entity == null) {
} return rb.setMsg("该项目不存在");
public void updateByDto(ScmVehicleInspectitemDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
} }
ScmVehicleInspectitem entity = fetchBySid(dtoSid); ScmVehicleInspectitemDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); //查询项目内容
baseMapper.updateById(entity); List<ScmVehicleInspectdetailDetailsVo> inspectdetail = scmVehicleInspectdetailService.selectByItemSid(sid);
inspectdetail.removeAll(Collections.singleton(null));
vo.setInspectdetail(inspectdetail);
//查询照片模板
List<ScmVehicleInspectimgtempDetailsVo> inspectimgtemp = scmVehicleInspectimgtempService.selectByItemSid(sid);
vo.setInspectimgtemp(inspectimgtemp);
return rb.success().setData(vo);
} }
public ScmVehicleInspectitemDetailsVo fetchDetailsVoBySid(String sid) { public void deleteAllBySid(String[] sids) {
ScmVehicleInspectitem entity = fetchBySid(sid); scmVehicleInspectdetailService.deleteAllByItemSid(sids);
ScmVehicleInspectitemDetailsVo vo = new ScmVehicleInspectitemDetailsVo(); scmVehicleInspectimgtempService.deleteAllByItemSid(sids);
BeanUtil.copyProperties(entity, vo); delBySids(sids);
return vo;
} }
} }
Loading…
Cancel
Save