Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -75,7 +75,7 @@ public interface FinPaymentrecordFeign {
     ResultBean updateState(@RequestBody String[] sids);
 
     @ApiOperation("生成预付款申请PDF")
-    @GetMapping("/createPdf")
+    @PostMapping("/createPdf")
     @ResponseBody
-    ResultBean createPdf(@RequestParam("sid") String sid);
+    public ResultBean<String> createPdf(@RequestParam("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -78,7 +78,7 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
     }
 
     @Override
-    public ResultBean createPdf(String sid) {
+    public ResultBean<String> createPdf(String sid) {
         return finPaymentrecordService.createPdf(sid);
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -335,7 +335,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return rb.success();
     }
 
-    public ResultBean createPdf(String sid) {
+    public ResultBean<String> createPdf(String sid) {
         ResultBean rb = ResultBean.fireFail();
         FinPaymentrecord finPaymentrecord = fetchBySid(sid);
         Map<String, Object> dataMap = new HashMap<String, Object>();
@@ -418,13 +418,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         //生成出门证文件名
         String pdfName = "预付款申请_" + dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
-        HttpServletResponse response = null;
-        try {
-            download(response,pdfName);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return rb.success();
+        return rb.success().setData("/template/" + pdfName);
     }
 
     public void download(HttpServletResponse response, String path) throws IOException {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@@ -51,12 +51,10 @@ import java.util.List;
 @ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件")
 public class ScmCollectionRebateQuery implements Query {
 
-	@ApiModelProperty("回款方式key")
+    @ApiModelProperty("回款方式key")
     private String collectionTypeKey; // 回款方式key
-	@ApiModelProperty("回款开始日期")
-    private String collectionStartDate; // 回款开始日期
-    @ApiModelProperty("回款结束日期")
-    private String collectionEndDate; // 回款结束日期
+    @ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("创建开始日期")

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -76,11 +76,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		if (StringUtils.isNotBlank(query.getCollectionTypeKey())){
 			qw.eq("collectionTypeKey",query.getCollectionTypeKey());
 		}
-		String collectionStartDate = query.getCollectionStartDate();
-		String collectionEndDate = query.getCollectionEndDate();
-		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
-				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
-				);
+		if (StringUtils.isNotBlank(query.getCollectionDate())){
+			qw.like("collectionDate",query.getCollectionDate());
+		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -98,8 +96,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
             this.insertByDto(dto);
             return; 
         }
-		if (dto.getState().equals("1")){
-			dto.setState("3");
+		ScmCollectionRebate scmCollectionRebate = fetchBySid(dtoSid);
+		if (scmCollectionRebate == null){
+			return;
 		}
 		this.updateByDto(dto);
 	}
@@ -141,11 +140,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
 			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
 		}
-		String collectionStartDate = query.getCollectionStartDate();
-		String collectionEndDate = query.getCollectionEndDate();
-		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
-				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
-				);
+		if (StringUtils.isNotBlank(query.getCollectionDate())){
+			qw.like("collectionDate",query.getCollectionDate());
+		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -168,11 +165,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
 			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
 		}
-		String collectionStartDate = query.getCollectionStartDate();
-		String collectionEndDate = query.getCollectionEndDate();
-		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
-				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
-				);
+		if (StringUtils.isNotBlank(query.getCollectionDate())){
+			qw.like("collectionDate",query.getCollectionDate());
+		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -202,11 +197,9 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
 			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
 		}
-		String collectionStartDate = query.getCollectionStartDate();
-		String collectionEndDate = query.getCollectionEndDate();
-		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
-				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
-				);
+		if (StringUtils.isNotBlank(query.getCollectionDate())){
+			qw.like("collectionDate",query.getCollectionDate());
+		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").