diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml
index 19a1972c..932e806b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/entity/FeClaimBillHEntity.xml
@@ -116,69 +116,122 @@
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java
index 825529b3..495a4208 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java
@@ -287,6 +287,9 @@ public class IClaimSKServiceImpl implements IClaimSKService {
String trantimep = kkBankflow.getTrantimep();
feClaimBillHEntity.setDef1(trandate + " " + trantimep);
+ //自动认领
+ feClaimBillHEntity.setIsAutoClaim("N");
+
}catch (Exception e){
e.printStackTrace();
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
index 36d3ba94..332f21d2 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimServiceImpl.java
@@ -108,6 +108,7 @@ public class IClaimServiceImpl implements IClaimService {
if("N".equals(claimBillHEntity.getPushStatus())){
claimBillHEntity.setPushStatusName("未推送");
}
+
}
PageInfo pageInfo = new PageInfo(claimBillHEntityList);
return pageInfo;
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/controller/BillTemplate.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/controller/BillTemplate.java
new file mode 100644
index 00000000..8414bb72
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/controller/BillTemplate.java
@@ -0,0 +1,71 @@
+package com.hzya.frame.finance.conf.billtemplate.controller;
+
+import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
+import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
+import com.hzya.frame.web.action.DefaultController;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by zydd on 2025-08-29 17:48
+ * 收付款单据模板
+ */
+@RestController
+@RequestMapping("/fe/conf/billtemplate")
+public class BillTemplate extends DefaultController {
+
+ @Autowired
+ private IFeConfBillTemplateService billTemplateService;
+
+ @RequestMapping("/queryAll")
+ public JsonResultEntity queryAll(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
+ try {
+ List all = billTemplateService.queryAll(billTemplateEntity);
+ return getSuccessMessageEntity("你太棒了！",all);
+ }catch (Exception e){
+ e.printStackTrace();
+ return getFailureMessageEntity(e.getMessage());
+ }
+ }
+
+ @RequestMapping("/save")
+ public JsonResultEntity save(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
+ try {
+ FeConfBillTemplateEntity entity = billTemplateService.saveEntity(billTemplateEntity);
+ return getSuccessMessageEntity("你太棒了！",entity);
+ }catch (Exception e){
+ e.printStackTrace();
+ return getFailureMessageEntity(e.getMessage());
+ }
+ }
+
+ @RequestMapping("/update")
+ public JsonResultEntity update(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
+ try {
+ FeConfBillTemplateEntity entity = billTemplateService.updateEntity(billTemplateEntity);
+ return getSuccessMessageEntity("你太棒了！",entity);
+ }catch (Exception e){
+ e.printStackTrace();
+ return getFailureMessageEntity(e.getMessage());
+ }
+ }
+
+ @RequestMapping("/delete")
+ public JsonResultEntity delete(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
+ try {
+ billTemplateService.deleteEntity(billTemplateEntity);
+ return getSuccessMessageEntity("你太棒了！",null);
+ }catch (Exception e){
+ e.printStackTrace();
+ return getFailureMessageEntity(e.getMessage());
+ }
+ }
+
+
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/entity/FeConfBillTemplateEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/entity/FeConfBillTemplateEntity.java
index 0dc30aa2..e7620ab7 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/entity/FeConfBillTemplateEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/entity/FeConfBillTemplateEntity.java
@@ -39,6 +39,9 @@ public class FeConfBillTemplateEntity extends BaseEntity {
* 部门
*/
private String hDeptStr;
+ /**
+ * 客户
+ */
private String hCustomerStr;
/**
* 币种
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/IFeConfBillTemplateService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/IFeConfBillTemplateService.java
index 3b9a5766..d55b0266 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/IFeConfBillTemplateService.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/IFeConfBillTemplateService.java
@@ -13,4 +13,10 @@ import java.util.List;
*/
public interface IFeConfBillTemplateService extends IBaseService{
List queryAll(FeConfBillTemplateEntity billTemplateEntity);
+
+ FeConfBillTemplateEntity saveEntity(FeConfBillTemplateEntity billTemplateEntity);
+
+ FeConfBillTemplateEntity updateEntity(FeConfBillTemplateEntity billTemplateEntity);
+
+ void deleteEntity(FeConfBillTemplateEntity billTemplateEntity);
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java
index b65a15b6..4d3b9037 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/billtemplate/service/impl/FeConfBillTemplateServiceImpl.java
@@ -1,11 +1,14 @@
package com.hzya.frame.finance.conf.billtemplate.service.impl;
+import cn.hutool.core.lang.Assert;
import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
import com.hzya.frame.finance.conf.billtemplate.dao.IFeConfBillTemplateDao;
import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
+
import javax.annotation.Resource;
+
import com.hzya.frame.basedao.service.impl.BaseService;
import java.util.List;
@@ -18,18 +21,55 @@ import java.util.List;
*/
@Service
public class FeConfBillTemplateServiceImpl extends BaseService implements IFeConfBillTemplateService {
-
+
private IFeConfBillTemplateDao feConfBillTemplateDao;
-
+
@Autowired
- public void setFeConfBillTemplateDao(IFeConfBillTemplateDao dao) {
- this.feConfBillTemplateDao = dao;
- this.dao = dao;
- }
+ public void setFeConfBillTemplateDao(IFeConfBillTemplateDao dao) {
+ this.feConfBillTemplateDao = dao;
+ this.dao = dao;
+ }
@Override
public List queryAll(FeConfBillTemplateEntity billTemplateEntity) {
List all = feConfBillTemplateDao.query(billTemplateEntity);
return all;
}
+
+ @Override
+ public FeConfBillTemplateEntity saveEntity(FeConfBillTemplateEntity billTemplateEntity) {
+ checkAssistNull("saveEntity",billTemplateEntity);
+ FeConfBillTemplateEntity save = feConfBillTemplateDao.save(billTemplateEntity);
+ return save;
+ }
+
+ @Override
+ public FeConfBillTemplateEntity updateEntity(FeConfBillTemplateEntity billTemplateEntity) {
+ checkAssistNull("updateEntity",billTemplateEntity);
+ feConfBillTemplateDao.update(billTemplateEntity);
+ return billTemplateEntity;
+ }
+
+ @Override
+ public void deleteEntity(FeConfBillTemplateEntity billTemplateEntity) {
+ checkAssistNull("deleteEntity",billTemplateEntity);
+ feConfBillTemplateDao.logicRemove(billTemplateEntity);
+ }
+
+
+ public void checkAssistNull(String type, FeConfBillTemplateEntity entity) {
+ switch (type) {
+ case "saveEntity":
+ Assert.notNull(entity.getName(),"收付款单据配置保存时，名称不能为空");
+ break;
+ case "updateEntity":
+ Assert.notNull(entity.getId(),"收付款单据配置更新时，id不能为空");
+ Assert.notNull(entity.getName(),"收付款单据配置更新时，名称不能为空");
+ break;
+ case "deleteEntity":
+ Assert.notNull(entity.getId(),"收付款单据配置删除时，id不能为空");
+ break;
+ }
+ }
+
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/controller/BillTemplate.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/controller/BillTemplate.java
deleted file mode 100644
index 7fd4d712..00000000
--- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/controller/BillTemplate.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hzya.frame.finance.conf.controller;
-
-import com.hzya.frame.finance.conf.billtemplate.entity.FeConfBillTemplateEntity;
-import com.hzya.frame.finance.conf.billtemplate.service.IFeConfBillTemplateService;
-import com.hzya.frame.web.action.DefaultController;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * Created by zydd on 2025-08-29 17:48
- * 收付款单据模板
- */
-@RestController
-@RequestMapping("/fe/conf/billtemplate")
-public class BillTemplate extends DefaultController {
-
- @Autowired
- private IFeConfBillTemplateService billTemplateService;
-
- @RequestMapping("/queryAll")
- public JsonResultEntity queryAll(@RequestBody FeConfBillTemplateEntity billTemplateEntity){
- try {
- List all = billTemplateService.queryAll(billTemplateEntity);
- return getSuccessMessageEntity("你太棒了！",all);
- }catch (Exception e){
- e.printStackTrace();
- return getFailureMessageEntity(e.getMessage());
- }
- }
-
-
-}