修改

yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java

@@ -25,28 +25,16 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldpartreturnapply;
 
-
 import com.yxt.common.core.query.Query;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-as(旧件返厂) <br/>
- * File: AsOldpartreturnApplyQuery.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery <br/>
- * Description: 旧件返厂申请 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:49 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件")
 public class AsOldpartreturnApplyQuery implements Query {
@@ -57,7 +45,7 @@ public class AsOldpartreturnApplyQuery implements Query {
     private String deptName;
     @ApiModelProperty("申请人")
     private String createByName;
-	@ApiModelProperty("单据编号")
+    @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("申请开始日期")
     private String createStartTime;

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

@@ -25,26 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldpartreturnconfirm;
 
-
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmQuery.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery <br/>
- * Description: 旧件返厂厂家确认 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:00 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件")
 public class AsOldpartreturnConfirmQuery implements Query {

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.as.api.asoldpartreturnconfirm;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
@@ -37,19 +36,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmVo.java <br/>
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo <br/>
- * Description: 旧件返厂厂家确认 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:00 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象")
 public class AsOldpartreturnConfirmVo implements Vo {

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

@@ -39,35 +39,22 @@ import org.apache.ibatis.annotations.Update;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-as(旧件返厂) <br/>
- * File: AsOldpartreturnApplyMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyMapper <br/>
- * Description: 旧件返厂申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-04-17 10:29:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnApply> {
 
-	IPage<AsOldpartreturnApplyVo> selectPageVo(IPage<AsOldpartreturnApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnApply> qw);
+    IPage<AsOldpartreturnApplyVo> selectPageVo(IPage<AsOldpartreturnApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnApply> qw);
 
-	int updateFlowFiled(Map<String, Object> map);
+    int updateFlowFiled(Map<String, Object> map);
 
     int selectBySid(String join);
 
-	String selectNum(String billNo);
+    String selectNum(String billNo);
 
     List<AsOldpartreturnDetailExcelVo> downloadTobeOutExcel(String sid);
 
-	@Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}")
+    @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}")
-	void updateState(@Param("sid") String sid,@Param("state") String state);
+    void updateState(@Param("sid") String sid, @Param("state") String state);
 
-	@Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}")
+    @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}")
-    void updateStateByBillNo(@Param("billNo") String billNo,@Param("state") String state);
+    void updateStateByBillNo(@Param("billNo") String billNo, @Param("state") String state);
 }

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

@@ -12,7 +12,7 @@
 		FROM
 		as_oldpartreturn_apply aoa
 		LEFT JOIN as_oldpartreturn AS ao
-		ON aoa.`sid` = ao.`mainSid`
+		ON aoa.sid = ao.mainSid
 		LEFT JOIN as_oldpartreturn_confirm ac
 		ON aoa.billNo = ac.billNo
 		LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid

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

@@ -205,6 +205,9 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
 		if (StringUtils.isNotBlank(query.getBillNo())){
 			qw.like("aoa.billNo",query.getBillNo());
 		}
+		if (StringUtils.isNotBlank(query.getConfirmResult())){
+			qw.like("ac.state",query.getConfirmResult());
+		}
 		qw.groupBy("aoa.sid");
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();

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

@@ -37,19 +37,6 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
 
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper <br/>
- * Description: 旧件返厂厂家确认. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface AsOldpartreturnConfirmMapper extends BaseMapper<AsOldpartreturnConfirm> {
 

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

@@ -12,7 +12,7 @@
 		FROM
 		as_oldpartreturn_confirm aoc
 		LEFT JOIN as_oldpartreturn_confirm_detail AS aod
-		ON aoc.`sid` = aod.`mainSid`
+		ON aoc.sid = aod.mainSid
 		LEFT JOIN anrui_portal.sys_organization AS s ON aoc.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

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

@@ -38,48 +38,35 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
 import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
 import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmFeignFallback.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmRest <br/>
- * Description: 旧件返厂厂家确认. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "旧件返厂厂家确认")
 @RestController
 @RequestMapping("v1/asoldpartreturnconfirm")
 public class AsOldpartreturnConfirmRest {
 
-	@Autowired
+    @Autowired
-	private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
+    private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
 
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq){
+    public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq);
+        PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
 
-	@ApiOperation("确认")
+    @ApiOperation("确认")
-	@PostMapping("/confirm")
+    @PostMapping("/confirm")
-	public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto){
+    public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		asOldpartreturnConfirmService.saveOrUpdateDto(dto);
+        asOldpartreturnConfirmService.saveOrUpdateDto(dto);
-		return rb.success();
+        return rb.success();
-	}
+    }
 
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
+        AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
+        return rb.success().setData(vo);
-	}
+    }
 }

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

@@ -56,19 +56,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Project: yxt-as(旧件返厂厂家确认) <br/>
- * File: AsOldpartreturnConfirmService.java <br/>
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmService <br/>
- * Description: 旧件返厂厂家确认 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-08-26 15:52:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartreturnConfirmMapper, AsOldpartreturnConfirm> {
 
@@ -138,6 +125,9 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("aoc.billNo", query.getBillNo());
         }
+        if (StringUtils.isNotBlank(query.getConfirmResult())) {
+            qw.like("aoc.state", query.getConfirmResult());
+        }
         qw.groupBy("aoc.sid");
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
@@ -208,6 +198,7 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
         }
         AsOldpartreturnConfirm entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setState(2);
         baseMapper.updateById(entity);
     }