旧件调整开发对接

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmDto.java

@@ -54,6 +54,8 @@ public class AsOldpartreturnConfirmDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
     @ApiModelProperty("返件数量确认(0一致,1不一致)")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java

@@ -55,11 +55,6 @@ import java.util.Map;
 public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnApply> {
 
 	IPage<AsOldpartreturnApplyVo> selectPageVo(IPage<AsOldpartreturnApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnApply> qw);
-	
-	List<AsOldpartreturnApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldpartreturnApply> qw);
-	
-	@Select("select * from as_oldpartreturn_apply")
-	List<AsOldpartreturnApplyVo> selectListVo();
 
 	int updateFlowFiled(Map<String, Object> map);
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml

@@ -25,10 +25,6 @@
 		LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo">
-		SELECT * FROM as_oldpartreturn_apply <where> ${ew.sqlSegment} </where>
-	</select>
 
 	<update id="updateFlowFiled">
 		UPDATE as_oldpartreturn_apply

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java

@@ -199,6 +199,17 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 				);
 		IPage<AsOldpartreturnApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsOldpartreturnApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		for (AsOldpartreturnApplyVo record : pagging.getRecords()) {
+			List<String> urlPahts = new ArrayList<>();
+			AsOldpartreturnApply asOldpartreturnApply = fetchBySid(record.getSid());
+			String filePath = asOldpartreturnApply.getFilePath();
+			String[] filePaths = filePath.split(",");
+			for (String path : filePaths) {
+				String url = fileUploadComponent.getUrlPrefix() + path;
+				urlPahts.add(url);
+			}
+			record.setFilePaths(urlPahts);
+		}
 		PagerVo<AsOldpartreturnApplyVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
@@ -612,16 +623,16 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 				String orgLevelKey = defaultIdReltBean.getData();
 				if ("1".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i1);
-					qw.like("aoa.orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("2".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i2);
-					qw.like("aoa.orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("3".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i3);
-					qw.like("aoa.orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("4".equals(orgLevelKey)) {
 					orgSidPath = orgSidPath.substring(0, i4);
-					qw.like("aoa.orgSidPath", orgSidPath);
+					qw.like("s.orgSidPath", orgSidPath);
 				} else if ("5".equals(orgLevelKey)) {
 					qw.eq("aoa.createBySid", query.getUserSid());
 				} else {
@@ -642,8 +653,20 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
 				);
+		qw.groupBy("aoa.sid");
 		IPage<AsOldpartreturnApply> page = PagerUtil.queryToPage(pq);
 		IPage<AsOldpartreturnApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		for (AsOldpartreturnApplyVo record : pagging.getRecords()) {
+			List<String> urlPahts = new ArrayList<>();
+			AsOldpartreturnApply asOldpartreturnApply = fetchBySid(record.getSid());
+			String filePath = asOldpartreturnApply.getFilePath();
+			String[] filePaths = filePath.split(",");
+			for (String path : filePaths) {
+				String url = fileUploadComponent.getUrlPrefix() + path;
+				urlPahts.add(url);
+			}
+			record.setFilePaths(urlPahts);
+		}
 		PagerVo<AsOldpartreturnApplyVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java

@@ -54,13 +54,6 @@ import java.util.List;
 @Mapper
 public interface AsOldpartreturnConfirmMapper extends BaseMapper<AsOldpartreturnConfirm> {
 
-	//@Update("update as_oldpartreturn_confirm set name=#{msg} where id=#{id}")
-	//IPage<AsOldpartreturnConfirmVo> voPage(IPage<AsOldpartreturnConfirm> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldpartreturnConfirm> qw);
-	
-	IPage<AsOldpartreturnConfirmVo> selectPageVo(IPage<AsOldpartreturnConfirm> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnConfirm> qw);
-	
-	List<AsOldpartreturnConfirmVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldpartreturnConfirm> qw);
-	
 	@Select("select * from as_oldpartreturn_confirm")
 	List<AsOldpartreturnConfirmVo> selectListVo();
 

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml

@@ -3,11 +3,4 @@
 <mapper namespace="com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo">
-		SELECT * FROM as_oldpartreturn_confirm <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo">
-		SELECT * FROM as_oldpartreturn_confirm <where> ${ew.sqlSegment} </where>
-	</select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java

@@ -59,14 +59,6 @@ public class AsOldpartreturnConfirmRest {
 	@Autowired
 	private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
 
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody AsOldpartreturnConfirmDto dto){

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java

@@ -73,22 +73,6 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
 	private FileUploadComponent fileUploadComponent;
 	@Autowired
 	private MessageFeign messageFeign;
-
-	private QueryWrapper<AsOldpartreturnConfirm> createQueryWrapper(AsOldpartreturnConfirmQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<AsOldpartreturnConfirm> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<AsOldpartreturnConfirmVo> listPageVo(PagerQuery<AsOldpartreturnConfirmQuery> pq) {
-		AsOldpartreturnConfirmQuery query = pq.getParams();
-		QueryWrapper<AsOldpartreturnConfirm> qw = createQueryWrapper(query);
-		IPage<AsOldpartreturnConfirm> page = PagerUtil.queryToPage(pq);
-		IPage<AsOldpartreturnConfirmVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<AsOldpartreturnConfirmVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
 	
 	public void saveOrUpdateDto(AsOldpartreturnConfirmDto dto){
         String dtoSid = dto.getSid();