src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -241,6 +241,7 @@ import com.jeeplus.modules.workreimbursement.entity.*;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementReplenishService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
+import com.jeeplus.modules.workreimbursement.utils.DateTimeUtil;
 import com.jeeplus.modules.workreimbursement.utils.HistoicFlowUtil;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workrelationship.service.WorkRelationshipService;
@@ -10530,19 +10531,25 @@ public class WorkProjectNotifyController extends BaseController {
 				}
 			}
 		}
-
+		String returnPath = "modules/workreimbursement/";
+		if(StringUtils.isNotBlank(workReimbursement.getId())){
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+				returnPath = returnPath + "treeForm/";
+			}
+		}
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			return "modules/workreimbursement/workReimbursementFormDetail";
+			return returnPath + "workReimbursementFormDetail";
 		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			model.addAttribute("identification","workreimbursement");
 			model.addAttribute("identificationName","报销审核意见");
-			return "modules/workreimbursement/specific/workReimbursementSpecificAudit";
+			return returnPath + "specific/workReimbursementSpecificAudit";
 		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 			User user=UserUtils.getUser();
 			model.addAttribute("user", user);
-			return "modules/workreimbursement/specific/workReimbursementSpecificModifyApply";
+			return returnPath + "specific/workReimbursementSpecificModifyApply";
 		} else {
-			return "modules/workreimbursement/workReimbursementFormDetail";
+			return returnPath + "workReimbursementFormDetail";
 		}
 	}
 
@@ -10589,24 +10596,33 @@ public class WorkProjectNotifyController extends BaseController {
 			}
 		}
 
+
+		String returnPath = "modules/workreimbursement/";
+		if(StringUtils.isNotBlank(workReimbursement.getId())){
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+				returnPath = returnPath + "treeForm/";
+			}
+		}
+
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			return "modules/workreimbursement/workReimbursementFormDetail";
+			return returnPath + "all/workReimbursementFormDetail";
 		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			model.addAttribute("identification","workreimbursement");
 			model.addAttribute("identificationName","报销审核意见");
 
 			if ("bxrbc".equals(workReimbursementReplenish.getAct().getTaskDefKey())) {
-				return "modules/workreimbursement/replenish/workReimbursementReplenishAudit";
+				return returnPath + "replenish/workReimbursementReplenishAudit";
 			}else{
-				return "modules/workreimbursement/replenish/workReimbursementReplenishCwAudit";
+				return returnPath + "replenish/workReimbursementReplenishCwAudit";
 			}
 
 		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 			User user=UserUtils.getUser();
 			model.addAttribute("user", user);
-			return "modules/workreimbursement/replenish/workReimbursementReplenishCwAudit";
+			return returnPath + "replenish/workReimbursementReplenishCwAudit";
 		} else {
-			return "modules/workreimbursement/workReimbursementFormDetail";
+			return returnPath + "all/workReimbursementFormDetail";
 		}
 	}
 
@@ -10692,8 +10708,16 @@ public class WorkProjectNotifyController extends BaseController {
 			}
 		}
 
+		String returnPath = "modules/workreimbursement/";
+		if(StringUtils.isNotBlank(workReimbursement.getId())){
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+				returnPath = returnPath + "treeForm/";
+			}
+		}
+
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-			return "modules/workreimbursement/workReimbursementFormDetail";
+			return returnPath + "workReimbursementFormDetail";
 		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			model.addAttribute("identification","workreimbursement");
 			model.addAttribute("identificationName","报销审核意见");
@@ -10703,13 +10727,13 @@ public class WorkProjectNotifyController extends BaseController {
 						/*if (workReimbursement.getAct() != null && StringUtils.isNotBlank(workReimbursement.getAct().getTaskDefKey()) && "cw".equals(workReimbursement.getAct().getTaskDefKey())) {
 							return "modules/workreimbursement/new/workReimbursementCWNewAudit";
 						}*/
-			return "modules/workreimbursement/new/workReimbursementNewAudit";
+			return returnPath + "new/workReimbursementNewAudit";
 		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 			User user=UserUtils.getUser();
 			model.addAttribute("user", user);
-			return "modules/workreimbursement/new/workReimbursementNewModifyApply";
+			return returnPath + "new/workReimbursementNewModifyApply";
 		} else {
-			return "modules/workreimbursement/workReimbursementFormDetail";
+			return returnPath + "workReimbursementFormDetail";
 		}
 	}
 

src/main/java/com/jeeplus/modules/workreimbursement/entity/ReimbursementVATTax.java

@@ -5,11 +5,15 @@ package com.jeeplus.modules.workreimbursement.entity;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 财务报销Entity
@@ -51,6 +55,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 	private String temporaryUrl;
 	private String attachmentName;
 	private String createById;
+	private String createByName;
 	private String type;
 	private String attachmentFlag;
 	private String fileSize;
@@ -58,6 +63,8 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 	private String workAttachmentId;
 
 	private String vatTaxStatus;
+	private String parentId;	//父节点id
+	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	public String getVatTaxStatus() {
 		return vatTaxStatus;
@@ -348,4 +355,28 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 	public void setWorkAttachmentId(String workAttachmentId) {
 		this.workAttachmentId = workAttachmentId;
 	}
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getCreateByName() {
+		return createByName;
+	}
+
+	public void setCreateByName(String createByName) {
+		this.createByName = createByName;
+	}
+
+	public List<WorkClientAttachment> getWorkAttachments() {
+		return workAttachments;
+	}
+
+	public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
+		this.workAttachments = workAttachments;
+	}
 }

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkAccount.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.workreimbursement.entity;
 
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
@@ -22,6 +23,7 @@ import java.util.List;
 public class WorkAccount extends DataEntity<WorkAccount> {
 
 	private static final long serialVersionUID = 1L;
+	private Integer serialNumber;		// 序号
 	private String type;		// 报销类别
 	private String typeParentIds;		// 报销类别父节点信息
 	private String typeName;		// 报销类别
@@ -30,6 +32,8 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	private String moneyAbstract;		// 报销费用摘要
     private String remarks;
     private BigDecimal money;  //报销费用（元）
+	private BigDecimal eInvoiceMoney;		// 数电发票报销金额
+	private BigDecimal invoiceMoney;		// 普通发票报销金额
 	private BigDecimal tax; //税金（元）
 	private WorkReimbursement workReimbursement;		// 报销单主键 父类
 	private List<WorkAccountAudit> workAccountAuditList;		// 报销单主键 父类
@@ -39,11 +43,14 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	private String projectReportNumber;//项目报告号
 	private String officeId;//部门id
 	private String reimbursementName;//报销人
+	private Integer eInvoiceBills;//数电发票单据数量
+	private Integer invoiceBills;//普通发票单据数量
 	private Integer bills;//单据数量
 	private Double evectionNumber;//出差天数
 	private Integer projectRadio;   //是否项目报销(1:项目报销 0：非项目报销)
 	private String reimburseRemarks;   //非项目报销  报销详情
 	private String reimbursementUserId;
+	private List<ReimbursementVATTax> reimbursementElectronicInvoiceVATTaxes = Lists.newArrayList();		// 子表列表
 
 
 	public String getInvoiceType() {
@@ -230,4 +237,52 @@ public class WorkAccount extends DataEntity<WorkAccount> {
 	public void setTypeParentIds(String typeParentIds) {
 		this.typeParentIds = typeParentIds;
 	}
+
+	public BigDecimal geteInvoiceMoney() {
+		return eInvoiceMoney;
+	}
+
+	public void seteInvoiceMoney(BigDecimal eInvoiceMoney) {
+		this.eInvoiceMoney = eInvoiceMoney;
+	}
+
+	public BigDecimal getInvoiceMoney() {
+		return invoiceMoney;
+	}
+
+	public void setInvoiceMoney(BigDecimal invoiceMoney) {
+		this.invoiceMoney = invoiceMoney;
+	}
+
+	public Integer geteInvoiceBills() {
+		return eInvoiceBills;
+	}
+
+	public void seteInvoiceBills(Integer eInvoiceBills) {
+		this.eInvoiceBills = eInvoiceBills;
+	}
+
+	public Integer getInvoiceBills() {
+		return invoiceBills;
+	}
+
+	public void setInvoiceBills(Integer invoiceBills) {
+		this.invoiceBills = invoiceBills;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public List<ReimbursementVATTax> getReimbursementElectronicInvoiceVATTaxes() {
+		return reimbursementElectronicInvoiceVATTaxes;
+	}
+
+	public void setReimbursementElectronicInvoiceVATTaxes(List<ReimbursementVATTax> reimbursementElectronicInvoiceVATTaxes) {
+		this.reimbursementElectronicInvoiceVATTaxes = reimbursementElectronicInvoiceVATTaxes;
+	}
 }

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkReimbursementReplenish.java

@@ -40,6 +40,7 @@ public class WorkReimbursementReplenish extends ActEntity<WorkReimbursementReple
 	private List<ReimbursementVATTax> reimbursementVATTaxes = Lists.newArrayList();		// 子表列表
 	private List<ReimbursementVATTax> reimbursementElectronicInvoiceVATTaxes = Lists.newArrayList();		// 子表列表
 	private List<WorkReimbursementBack> reimbursementBackList = Lists.newArrayList();		// 子表列表
+	private List<WorkAccount> workAccountList = Lists.newArrayList();
 
 	// 运行中的流程实例
 	private ProcessInstance processInstance;
@@ -183,4 +184,12 @@ public class WorkReimbursementReplenish extends ActEntity<WorkReimbursementReple
 	public void setHome(String home) {
 		this.home = home;
 	}
+
+	public List<WorkAccount> getWorkAccountList() {
+		return workAccountList;
+	}
+
+	public void setWorkAccountList(List<WorkAccount> workAccountList) {
+		this.workAccountList = workAccountList;
+	}
 }

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementNewService.java

@@ -35,6 +35,7 @@ import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxStatusDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkAccountDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkReimbursementDao;
 import com.jeeplus.modules.workreimbursement.entity.*;
+import com.jeeplus.modules.workreimbursement.utils.DateTimeUtil;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.dao.WorkReimbursementBackDao;
 import com.jeeplus.modules.workreimbursementback.entity.WorkReimbursementBack;
@@ -1226,53 +1227,100 @@ public class WorkReimbursementNewService extends CrudService<WorkReimbursementDa
 
     @Transactional(readOnly = false)
     public void updateWorkReimbursementInfo(WorkReimbursement workReimbursement) {
-            for (WorkAccount workAccount : workReimbursement.getWorkAccountList()) {
-                if(null == workAccount.getId()){
-                    continue;
+        List<ReimbursementVATTax> temporaryReimbursementElectronicInvoiceVATTaxes = Lists.newArrayList();
+        for (WorkAccount workAccount : workReimbursement.getWorkAccountList()) {
+            if(null == workAccount.getId()){
+                continue;
+            }
+            String id = workAccount.getId();
+            //如果id种包含random，则表示该数据是后加的，可能存在子节点数据，可以根据id进行获取，并处理
+            List<ReimbursementVATTax> invoiceList = Lists.newArrayList();
+            if(id.contains("random")){
+                for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                    if(null == invoiceVATTax.getParentId()){
+                        continue;
+                    }
+                    if(invoiceVATTax.getParentId().contains(id)){
+                        invoiceList.add(invoiceVATTax);
+                    }
                 }
-                if(StringUtils.isNotBlank(workAccount.getReimbursementName())){
-                    //添加人员部门id
-                    User user = UserUtils.get(workAccount.getReimbursementName());
-                    workAccount.setOfficeId(user.getOffice().getId());
-                }else{
-                    workAccount.setOfficeId("");
+                workAccount.setId("");
+            }else{
+                for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                    if(null == invoiceVATTax.getParentId()){
+                        continue;
+                    }
+                    if(invoiceVATTax.getParentId().contains("#workAccountList_")){
+                        invoiceVATTax.setParentId(invoiceVATTax.getParentId().replace("#workAccountList_", ""));
+                    }
                 }
-                //根据是否为项目报销设置数据信息
-                if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
-                    workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
-                }else if (null != workAccount.getProjectRadio() && workAccount.getProjectRadio() ==1 && StringUtils.isBlank(workAccount.getProject().getId())){
-                    workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
+            }
+
+            for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                if(null == invoiceVATTax.getInvoiceNumber()){
+                    continue;
                 }
-                if (WorkAccount.DEL_FLAG_NORMAL.equals(workAccount.getDelFlag())) {
-                    List<WorkAccountAudit> workAccountAudits = workAccount.getWorkAccountAuditList();
-                    List<WorkAccountAudit> workAccountAuditList = new ArrayList<>();
-                    if (workAccountAudits != null && workAccountAudits.size() != 0) {
-                        for (WorkAccountAudit workAccountAudit : workAccountAudits) {
-                            if (StringUtils.isNotBlank(workAccountAudit.getCheckSubjects())
-                                    || workAccountAudit.getCheckMoney() != null||StringUtils.isNotBlank(workAccountAudit.getU8Subjects())) {
-                                workAccountAuditList.add(workAccountAudit);
-                            }
+                invoiceVATTax.setParentId(workAccount.getId());
+                temporaryReimbursementElectronicInvoiceVATTaxes.add(invoiceVATTax);
+            }
+
+
+            if(StringUtils.isNotBlank(workAccount.getReimbursementName())){
+                //添加人员部门id
+                User user = UserUtils.get(workAccount.getReimbursementName());
+                workAccount.setOfficeId(user.getOffice().getId());
+            }else{
+                workAccount.setOfficeId("");
+            }
+            //根据是否为项目报销设置数据信息
+            if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
+                workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
+            }else if (null != workAccount.getProjectRadio() && workAccount.getProjectRadio() ==1 && StringUtils.isBlank(workAccount.getProject().getId())){
+                workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
+            }
+            if (WorkAccount.DEL_FLAG_NORMAL.equals(workAccount.getDelFlag())) {
+                List<WorkAccountAudit> workAccountAudits = workAccount.getWorkAccountAuditList();
+                List<WorkAccountAudit> workAccountAuditList = new ArrayList<>();
+                if (workAccountAudits != null && workAccountAudits.size() != 0) {
+                    for (WorkAccountAudit workAccountAudit : workAccountAudits) {
+                        if (StringUtils.isNotBlank(workAccountAudit.getCheckSubjects())
+                                || workAccountAudit.getCheckMoney() != null||StringUtils.isNotBlank(workAccountAudit.getU8Subjects())) {
+                            workAccountAuditList.add(workAccountAudit);
                         }
-                        workAccount.setWorkAccountAuditList(workAccountAuditList);
-                        workAccountDao.deleteAudits(workAccount);
-                        workAccountDao.insertAudits(workAccount);
-                    }
-                    if (StringUtils.isNotBlank(workReimbursement.getExt()) && workReimbursement.getExt().equals("1")) {
-                        workAccount.setFinancialSubjects(workAccount.getFinancialSubjectss());
-                    }
-                    workAccount.setWorkReimbursement(workReimbursement);
-                    if (StringUtils.isBlank(workAccount.getId())) {
-                        workAccount.preInsert();
-                        workAccountDao.insert(workAccount);
-                    } else {
-                        workAccount.preUpdate();
-                        workAccountDao.update(workAccount);
                     }
-
+                    workAccount.setWorkAccountAuditList(workAccountAuditList);
+                    workAccountDao.deleteAudits(workAccount);
+                    workAccountDao.insertAudits(workAccount);
+                }
+                if (StringUtils.isNotBlank(workReimbursement.getExt()) && workReimbursement.getExt().equals("1")) {
+                    workAccount.setFinancialSubjects(workAccount.getFinancialSubjectss());
+                }
+                workAccount.setWorkReimbursement(workReimbursement);
+                if (StringUtils.isBlank(workAccount.getId())) {
+                    workAccount.preInsert();
+                    workAccountDao.insert(workAccount);
                 } else {
-                    workAccountDao.delete(workAccount);
+                    workAccount.preUpdate();
+                    workAccountDao.update(workAccount);
                 }
+
+            } else {
+                workAccountDao.delete(workAccount);
             }
+
+            //如果invoiceList不为空，则对其下的报销数据进行处理
+            for (ReimbursementVATTax info : invoiceList) {
+                for (ReimbursementVATTax invoiceVATTax : temporaryReimbursementElectronicInvoiceVATTaxes) {
+                    if(info.getParentId().equals(invoiceVATTax.getParentId())){
+                        invoiceVATTax.setParentId(workAccount.getId());
+                    }
+                }
+            }
+        }
+        if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+            workReimbursement.setReimbursementElectronicInvoiceVATTaxes(Lists.newArrayList());
+            workReimbursement.setReimbursementElectronicInvoiceVATTaxes(temporaryReimbursementElectronicInvoiceVATTaxes);
+        }
         List<WorkClientAttachment> disposeAttachmentList = Lists.newArrayList();
         //处理数电发票附件信息
         List<ReimbursementVATTax> reimbursementElectronicInvoiceVATTaxes = workReimbursement.getReimbursementElectronicInvoiceVATTaxes();

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementReplenishService.java

@@ -36,6 +36,7 @@ import com.jeeplus.modules.workreimbursement.dao.WorkAccountDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkReimbursementDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkReimbursementReplenishDao;
 import com.jeeplus.modules.workreimbursement.entity.*;
+import com.jeeplus.modules.workreimbursement.utils.DateTimeUtil;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.dao.WorkReimbursementBackDao;
 import com.jeeplus.modules.workreimbursementback.entity.WorkReimbursementBack;
@@ -270,6 +271,100 @@ public class WorkReimbursementReplenishService extends CrudService<WorkReimburse
      */
     @Transactional(readOnly = false)
     public void replenishWorkReimbursementAttachmentInfo(WorkReimbursement workReimbursement) {
+        workReimbursement.setReimbursementElectronicInvoiceVATTaxes(Lists.newArrayList());
+        List<ReimbursementVATTax> temporaryReimbursementElectronicInvoiceVATTaxes = Lists.newArrayList();
+        for (WorkAccount workAccount : workReimbursement.getWorkAccountList()) {
+            if(null == workAccount.getId()){
+                continue;
+            }
+            String id = workAccount.getId();
+            //如果id种包含random，则表示该数据是后加的，可能存在子节点数据，可以根据id进行获取，并处理
+            List<ReimbursementVATTax> invoiceList = Lists.newArrayList();
+            if(id.contains("random")){
+                for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                    if(null == invoiceVATTax.getParentId()){
+                        continue;
+                    }
+                    if(invoiceVATTax.getParentId().contains(id)){
+                        invoiceList.add(invoiceVATTax);
+                    }
+                }
+                workAccount.setId("");
+            }else{
+                for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                    if(null == invoiceVATTax.getParentId()){
+                        continue;
+                    }
+                    if(invoiceVATTax.getParentId().contains("#workAccountList_")){
+                        invoiceVATTax.setParentId(invoiceVATTax.getParentId().replace("#workAccountList_", ""));
+                    }
+                }
+            }
+
+            for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                if(null == invoiceVATTax.getInvoiceNumber()){
+                    continue;
+                }
+                invoiceVATTax.setParentId(workAccount.getId());
+                temporaryReimbursementElectronicInvoiceVATTaxes.add(invoiceVATTax);
+            }
+
+
+            if(StringUtils.isNotBlank(workAccount.getReimbursementName())){
+                //添加人员部门id
+                User user = UserUtils.get(workAccount.getReimbursementName());
+                Office selectOffice = UserUtils.getSelectOffice();
+                workAccount.setOfficeId(selectOffice.getId());
+            }else{
+                workAccount.setOfficeId("");
+            }
+            //根据是否为项目报销设置数据信息
+            if(null != workAccount.getProjectRadio() && workAccount.getProjectRadio() == 0){
+                workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
+            }else if (null != workAccount.getProjectRadio() && workAccount.getProjectRadio() ==1 && StringUtils.isBlank(workAccount.getProject().getId())){
+                workAccount.setReimburseRemarks(workAccount.getProject().getProjectName());
+            }
+            if (WorkAccount.DEL_FLAG_NORMAL.equals(workAccount.getDelFlag())) {
+                List<WorkAccountAudit> workAccountAudits = workAccount.getWorkAccountAuditList();
+                List<WorkAccountAudit> workAccountAuditList = new ArrayList<>();
+                if (workAccountAudits != null && workAccountAudits.size() != 0) {
+                    for (WorkAccountAudit workAccountAudit : workAccountAudits) {
+                        if (StringUtils.isNotBlank(workAccountAudit.getCheckSubjects())
+                                || workAccountAudit.getCheckMoney() != null||StringUtils.isNotBlank(workAccountAudit.getU8Subjects())) {
+                            workAccountAuditList.add(workAccountAudit);
+                        }
+                    }
+                    workAccount.setWorkAccountAuditList(workAccountAuditList);
+                    workAccountDao.deleteAudits(workAccount);
+                    workAccountDao.insertAudits(workAccount);
+                }
+                if (StringUtils.isNotBlank(workReimbursement.getExt()) && workReimbursement.getExt().equals("1")) {
+                    workAccount.setFinancialSubjects(workAccount.getFinancialSubjectss());
+                }
+                workAccount.setWorkReimbursement(workReimbursement);
+                if (StringUtils.isBlank(workAccount.getId())) {
+                    workAccount.preInsert();
+                    workAccountDao.insert(workAccount);
+                } else {
+                    workAccount.preUpdate();
+                    workAccountDao.update(workAccount);
+                }
+
+            } else {
+                workAccountDao.delete(workAccount);
+            }
+
+            //如果invoiceList不为空，则对其下的报销数据进行处理
+            for (ReimbursementVATTax info : invoiceList) {
+                for (ReimbursementVATTax invoiceVATTax : workReimbursement.getReimbursementElectronicInvoiceVATTaxes()) {
+                    if(info.getParentId().equals(invoiceVATTax.getParentId())){
+                        invoiceVATTax.setParentId(workAccount.getId());
+                    }
+                }
+            }
+        }
+        workReimbursement.setReimbursementElectronicInvoiceVATTaxes(temporaryReimbursementElectronicInvoiceVATTaxes);
+
         for (ReimbursementVATTax reimbursementVATTax : workReimbursement.getReimbursementVATTaxes()) {
             //普通报销 发票信息
             reimbursementVATTax.setReimbursementType("0");
@@ -287,6 +382,42 @@ public class WorkReimbursementReplenishService extends CrudService<WorkReimburse
             }
         }
 
+        if(DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())){
+            List<WorkClientAttachment> disposeAttachmentList = Lists.newArrayList();
+            //处理数电发票附件信息
+            List<ReimbursementVATTax> reimbursementElectronicInvoiceVATTaxes = workReimbursement.getReimbursementElectronicInvoiceVATTaxes();
+            if(!reimbursementElectronicInvoiceVATTaxes.isEmpty()){
+                for(int i = 0; i < reimbursementElectronicInvoiceVATTaxes.size(); i ++){
+                    ReimbursementVATTax reimbursementVATTax = reimbursementElectronicInvoiceVATTaxes.get(i);
+                    //判定有没有附件url
+                    if(StringUtils.isNotBlank(reimbursementVATTax.getUrl()) && !"1".equals(reimbursementVATTax.getDelFlag())){
+                        WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+                        workClientAttachment.setUrl(reimbursementVATTax.getUrl());
+                        workClientAttachment.setAttachmentName(reimbursementVATTax.getAttachmentName());
+                        workClientAttachment.setDivIdType(reimbursementVATTax.getDivIdType());
+                        workClientAttachment.setType(reimbursementVATTax.getType());
+                        workClientAttachment.setAttachmentId(workReimbursement.getId());
+                        workClientAttachment.setProjectId(reimbursementVATTax.getInvoiceNumber());
+                        workClientAttachment.setFileSize(reimbursementVATTax.getFileSize());
+                        workClientAttachment.setAttachmentFlag(reimbursementVATTax.getAttachmentFlag());
+                        workClientAttachment.setSort(String.valueOf(i +1));
+                        workClientAttachment.setDelFlag("0");
+                        if(StringUtils.isNotBlank(reimbursementVATTax.getId())){
+                            workClientAttachment.setId(reimbursementVATTax.getId());
+                        }else{
+                            workClientAttachment.setId("");
+                        }
+
+                        disposeAttachmentList.add(workClientAttachment);
+                    }
+                }
+            }
+
+            if(!disposeAttachmentList.isEmpty()){
+                workReimbursement.getWorkAttachments().addAll(disposeAttachmentList);
+            }
+        }
+
         for (ReimbursementVATTax reimbursementVATTax : workReimbursement.getReimbursementElectronicInvoiceVATTaxes()) {
             //电子发票报销 发票信息
             reimbursementVATTax.setReimbursementType("1");
@@ -303,6 +434,9 @@ public class WorkReimbursementReplenishService extends CrudService<WorkReimburse
                 reimbursementVATTaxDao.delete(reimbursementVATTax);
             }
         }
+
+
+
         //附件信息
         for (WorkClientAttachment workClientAttachment : workReimbursement.getWorkAttachments()) {
             if (workClientAttachment.getId() == null) {
@@ -340,9 +474,17 @@ public class WorkReimbursementReplenishService extends CrudService<WorkReimburse
         }
         // 对不同环节的业务逻辑进行操作
         String taskDefKey = workReimbursementReplenish.getAct().getTaskDefKey();
-        if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") ) {
+
+        // 比较当前日期是否在2025年10月1日之后
+        if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+            workReimbursement.setWorkAccountList(workReimbursementReplenish.getWorkAccountList());
+        }
+
+        if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") && !taskDefKey.contains("fpglys") ) {
             actTaskService.claim(workReimbursementReplenish.getAct().getTaskId(), UserUtils.getUser().getId());
             replenishWorkReimbursementAttachmentInfo(workReimbursement);
+        }else if(taskDefKey.contains("fpglys")) {
+            //replenishWorkReimbursementAttachmentInfo(workReimbursement);
         }else{
             workReimbursementReplenish.getAct().setFlag("yes");
             if("modifyApply".equals(taskDefKey)) {

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -695,11 +695,46 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
     @Transactional(readOnly = false)
     public void updateWorkReimbursementInfo(WorkReimbursement workReimbursement) {
+        workReimbursement.setReimbursementElectronicInvoiceVATTaxes(Lists.newArrayList());
+        List<ReimbursementVATTax> temporaryReimbursementElectronicInvoiceVATTaxes = Lists.newArrayList();
         try {
             for (WorkAccount workAccount : workReimbursement.getWorkAccountList()) {
                 if(null == workAccount.getId()){
                     continue;
                 }
+                String id = workAccount.getId();
+                //如果id种包含random，则表示该数据是后加的，可能存在子节点数据，可以根据id进行获取，并处理
+                List<ReimbursementVATTax> invoiceList = Lists.newArrayList();
+                if(id.contains("random")){
+                    for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                        if(null == invoiceVATTax.getParentId()){
+                            continue;
+                        }
+                        if(invoiceVATTax.getParentId().contains(id)){
+                            invoiceList.add(invoiceVATTax);
+                        }
+                    }
+                    workAccount.setId("");
+                }else{
+                    for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                        if(null == invoiceVATTax.getParentId()){
+                            continue;
+                        }
+                        if(invoiceVATTax.getParentId().contains("#workAccountList_")){
+                            invoiceVATTax.setParentId(invoiceVATTax.getParentId().replace("#workAccountList_", ""));
+                        }
+                    }
+                }
+
+                for (ReimbursementVATTax invoiceVATTax : workAccount.getReimbursementElectronicInvoiceVATTaxes()) {
+                    if(null == invoiceVATTax.getInvoiceNumber()){
+                        continue;
+                    }
+                    invoiceVATTax.setParentId(workAccount.getId());
+                    temporaryReimbursementElectronicInvoiceVATTaxes.add(invoiceVATTax);
+                }
+
+
                 if(StringUtils.isNotBlank(workAccount.getReimbursementName())){
                     //添加人员部门id
                     User user = UserUtils.get(workAccount.getReimbursementName());
@@ -742,7 +777,18 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                 } else {
                     workAccountDao.delete(workAccount);
                 }
+
+                //如果invoiceList不为空，则对其下的报销数据进行处理
+                for (ReimbursementVATTax info : invoiceList) {
+                    for (ReimbursementVATTax invoiceVATTax : workReimbursement.getReimbursementElectronicInvoiceVATTaxes()) {
+                        if(info.getParentId().equals(invoiceVATTax.getParentId())){
+                            invoiceVATTax.setParentId(workAccount.getId());
+                        }
+                    }
+                }
             }
+            workReimbursement.setReimbursementElectronicInvoiceVATTaxes(temporaryReimbursementElectronicInvoiceVATTaxes);
+
 
             List<WorkClientAttachment> disposeAttachmentList = Lists.newArrayList();
             //处理数电发票附件信息

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementAllController.java

@@ -47,6 +47,7 @@ import com.jeeplus.modules.workreimbursement.service.WorkReimbursementAllService
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementNewService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
+import com.jeeplus.modules.workreimbursement.utils.DateTimeUtil;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.entity.WorkReimbursementBack;
 import com.jeeplus.modules.workreimbursementback.service.WorkReimbursementBackService;
@@ -394,9 +395,19 @@ public class WorkReimbursementAllController extends BaseController {
 			workReimbursement.setReimbursementType("1");
 		}
 
-
-
 		model.addAttribute("workReimbursement", workReimbursement);
+
+		if(StringUtils.isNotBlank(workReimbursement.getId())){
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+				return "modules/workreimbursement/treeForm/all/"+view;
+			}
+		}else{
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirst()) {
+				return "modules/workreimbursement/treeForm/all/"+view;
+			}
+		}
 		return "modules/workreimbursement/all/"+view;
 	}
 
@@ -538,7 +549,6 @@ public class WorkReimbursementAllController extends BaseController {
 	public String saveAudit(WorkReimbursement workReimbursement, Model model,
 							RedirectAttributes redirectAttributes) {
 		try {
-			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workReimbursement.getAct().getTaskDefKey();
 			List<User> users = null;
 
@@ -553,50 +563,103 @@ public class WorkReimbursementAllController extends BaseController {
 
 			Date auditDate = Date.from(localDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
 
+
 			Date nowDate = new Date();
 			// 调用compareTo()方法进行比较
 			int result = nowDate.compareTo(auditDate);
 			//判定当前数据已经在数据库存在并且发起时间是在特定日期之后，并且部门是工程四部
 			//如果当前登录人为工程四部，且当前时间在2024-01-20之前
 
-			if ("bmzr".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),2);
-				if (users==null )
-					//users = UserUtils.getByRoleActivityEnname("fgld",2,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-					users = UserUtils.getByRoleActivityEnname("cwzg", 3, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
 
 
-				if(StringUtils.isNotBlank(workReimbursement.getId()) && result > 0 && "10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
-					users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+			LocalDate reimbursementThreeLocalDate = LocalDate.of(2025, 5, 17);
 
-				}
-			}else  if ("cw".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
-				if (users==null )
-					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
-				if("0".equals(workReimbursement.getReimbursementType())){
-					if(reimburseResult>0){
+			Date reimbursementThreeAuditDate = Date.from(reimbursementThreeLocalDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+
+			// 调用compareTo()方法进行比较
+			int reimbursementThreeResult = nowDate.compareTo(reimbursementThreeAuditDate);
+
+
+			if(reimbursementThreeResult > 0 && (null ==workReimbursement.getOldDataType() || workReimbursement.getOldDataType() > 0) && !"10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
+				if ("bmzr".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
+					if (users==null )
+						users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+					if("0".equals(workReimbursement.getReimbursementType())){
+						if(reimburseResult>0){
+							users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+						}else{
+							users = UserUtils.getByRoleActivityEnname("zjbfzribvf",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+						}
+					}else if ("1".equals(workReimbursement.getReimbursementType())){
 						users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-					}else{
+					}
+				}else  if ("cw".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),2);
+					if (users==null ){
+						//users = UserUtils.getByRoleActivityEnname("fgld",2,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+						if("d8cf33fafd2d4f04a603e89f7e28e54c".equals(workReimbursement.getOfficeId())) {	//如果是苏州团队的  部门主任审核人为一部部门主任
+							users = UserUtils.getByRoleActivityEnname("bmzr", 2, "7f776d072d7b4c839cef4e63ce6dbfa5", "8", workReimbursement.getCreateBy());
+						}else{
+							users = UserUtils.getByRoleActivityEnname("bmzr", 2, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
+						}
+					}
+
+				}else  if ("gsld".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
+					if (users==null )
+						users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+					//users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+				}else  if ("fpglys".equals(taskDefKey) || "dzfpbxshybxsd".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
+					if(reimburseResult>0){
 						users = UserUtils.getByRoleActivityEnname("zjbfzribvf",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
 					}
-				}else if ("1".equals(workReimbursement.getReimbursementType())){
-					users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-				}
-			}else  if ("gsld".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
-				if (users==null )
+					if (users==null )
+						users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+				}else if ("modifyApply".equals(taskDefKey)){
 					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
-				//users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-			}else  if ("fpglys".equals(taskDefKey) || "dzfpbxshybxsd".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
-				if(reimburseResult>0){
-					users = UserUtils.getByRoleActivityEnname("zjbfzribvf",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
 				}
-				if (users==null )
-					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
-			}/*else  if ("zjl".equals(taskDefKey)){
-			 *//*users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),5);
+
+			}else{
+				if ("bmzr".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),2);
+					if (users==null )
+						//users = UserUtils.getByRoleActivityEnname("fgld",2,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+						users = UserUtils.getByRoleActivityEnname("cwzg", 3, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
+
+
+					if(StringUtils.isNotBlank(workReimbursement.getId()) && result > 0 && "10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
+						users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+
+					}
+				}else  if ("cw".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
+					if (users==null )
+						users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+					if("0".equals(workReimbursement.getReimbursementType())){
+						if(reimburseResult>0){
+							users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+						}else{
+							users = UserUtils.getByRoleActivityEnname("zjbfzribvf",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+						}
+					}else if ("1".equals(workReimbursement.getReimbursementType())){
+						users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+					}
+				}else  if ("gsld".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
+					if (users==null )
+						users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+					//users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+				}else  if ("fpglys".equals(taskDefKey) || "dzfpbxshybxsd".equals(taskDefKey)){
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
+					if(reimburseResult>0){
+						users = UserUtils.getByRoleActivityEnname("zjbfzribvf",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+					}
+					if (users==null )
+						users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+				}/*else  if ("zjl".equals(taskDefKey)){
+				 *//*users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),5);
 				if (users==null )
 					users = UserUtils.getByRoleActivityEnname("cwfgld",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());*//*
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
@@ -607,21 +670,22 @@ public class WorkReimbursementAllController extends BaseController {
 			}else if ("cn".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
 			}*/else if ("modifyApply".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+				}
 			}
+
 			String flag = workReimbursement.getAct().getFlag();
 			if ("yes".equals(flag) &&(users==null || users.size()==0)){
 				addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
 			}else {
 				String str = "";
 
-
-				if(StringUtils.isNotBlank(workReimbursement.getId()) && result > 0 && "10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
+				if("10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
 					str = workReimbursementNewService.auditSpecificSave(workReimbursement,users);
 				}else{
-					if(result > 0 && "10de4a17d3484ba58135364bd53b88de".equals(workReimbursement.getOfficeId())){
-						str = workReimbursementNewService.auditSpecificSave(workReimbursement,users);
-					} else {
+					if(reimbursementThreeResult > 0 && workReimbursement.getOldDataType() > 0){
+						str = workReimbursementNewService.auditSaveReimbursementThree(workReimbursement,users);
+					}else{
 						if("0".equals(workReimbursement.getReimbursementType())){
 							if(reimburseResult>0){
 								str = workReimbursementNewService.auditSaveThree(workReimbursement,users);

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -1257,7 +1257,7 @@ public class WorkReimbursementController extends BaseController {
             String result = String.join(",", strings);
             if (result.length() > 0) {
                 map.put("success", false);
-                map.put("message", "数电发票编号为：" + result + "已进行上报，无法重复上报");
+                map.put("message", "数电发票编号为：" + result + "已进行发起报销，无法重复发起");
             }
         }
         return map;

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementNewController.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.workreimbursement.web;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.jeeplus.common.config.Global;
@@ -10,19 +11,19 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
-import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementadminupdatehistory;
+import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxStatusDao;
+import com.jeeplus.modules.workreimbursement.entity.*;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementNewService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementService;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementTypeService;
+import com.jeeplus.modules.workreimbursement.utils.DateTimeUtil;
 import com.jeeplus.modules.workreimbursementback.entity.WorkReimbursementBack;
 import com.jeeplus.modules.workreimbursementback.service.WorkReimbursementBackService;
 import org.activiti.engine.RuntimeService;
@@ -43,6 +44,7 @@ import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 财务报销新Controller
@@ -75,6 +77,8 @@ public class WorkReimbursementNewController extends BaseController {
 	private WorkReimbursementTypeService workReimbursementTypeService;
 	@Autowired
 	protected WorkProjectNotifyService workProjectNotifyService;
+	@Autowired
+	private ReimbursementVATTaxStatusDao reimbursementVATTaxStatusDao;
 
 	@ModelAttribute
 	public WorkReimbursement get(@RequestParam(required=false) String id) {
@@ -89,6 +93,72 @@ public class WorkReimbursementNewController extends BaseController {
 		return entity;
 	}
 
+	@ResponseBody
+	@RequestMapping(value = "formTwo")
+	public WorkReimbursement formTwo(@RequestParam("id") String id, Model model) {
+		WorkReimbursement workReimbursement = workReimbursementService.get(id);
+		workReimbursementService.isNotProject(workReimbursement);
+
+		model.addAttribute("workReimbursement", workReimbursement);
+		return workReimbursement;
+	}
+
+	@ResponseBody
+	@RequestMapping(value = "formByAccount")
+	public List<ReimbursementVATTax> formByAccount(@RequestParam("id") String id, String workAccountId, String lineNumber, Model model) {
+		List<ReimbursementVATTax> list = Lists.newArrayList();
+		if (StringUtils.isNotBlank(workAccountId)) {
+			WorkReimbursement workReimbursement = workReimbursementService.get(id);
+			for (ReimbursementVATTax invoiceVATTax : workReimbursement.getReimbursementElectronicInvoiceVATTaxes()) {
+				if(workAccountId.equals(invoiceVATTax.getParentId()) || (StringUtils.isBlank(invoiceVATTax.getParentId()) && StringUtils.isNotBlank(lineNumber) && "0".equals(lineNumber))){
+					if(null != invoiceVATTax.getCreateBy() && StringUtils.isNotBlank(invoiceVATTax.getCreateBy().getName())){
+						invoiceVATTax.setCreateByName(invoiceVATTax.getCreateBy().getName());
+					}else{
+						invoiceVATTax.setCreateByName("");
+					}
+					if(StringUtils.isBlank(invoiceVATTax.getParentId()) ){
+						invoiceVATTax.setParentId(workAccountId);
+					}
+					list.add(invoiceVATTax);
+				}
+			}
+
+			if(null != list && list.size()>0){
+				ReimbursementVATTaxStatus reimbursementVATTaxStatus = new ReimbursementVATTaxStatus();
+				reimbursementVATTaxStatus.setReimbursementId(workReimbursement.getId());
+				List<ReimbursementVATTaxStatus> VATTaxStatusList = reimbursementVATTaxStatusDao.findList(reimbursementVATTaxStatus);
+
+				Map<String, String> statusMap = VATTaxStatusList.stream()
+						.collect(Collectors.toMap(
+								ReimbursementVATTaxStatus::getVatTaxId,  // 返回String类型
+								ReimbursementVATTaxStatus::getStatus,
+								(existing, replacement) -> existing
+						));
+				//获取专业类型
+				List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("invoiceReimbursementType");
+				for (ReimbursementVATTax vatTax : list) {
+					//判断状态
+					String status = statusMap.get(vatTax.getId());
+					if (status != null) {
+						vatTax.setVatTaxStatus(status);
+					} else {
+						vatTax.setVatTaxStatus("0");  // 默认字符串"0"
+					}
+
+					for (MainDictDetail dictDetail : certificateMajor) {
+						if(dictDetail.getValue().equals(vatTax.getInvoiceType())){
+							vatTax.setInvoiceTypeStr(dictDetail.getLabel());
+						}
+					}
+				}
+			}
+
+		}
+
+
+		model.addAttribute("list", list);
+		return list;
+	}
 	/**
 	 * 查看，增加，编辑报销单表单页面
 	 */
@@ -180,6 +250,18 @@ public class WorkReimbursementNewController extends BaseController {
 		}
 
 		model.addAttribute("workReimbursement", workReimbursement);
+
+		if(StringUtils.isNotBlank(workReimbursement.getId())){
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirstOnDate(workReimbursement.getCreateDate())) {
+				return "modules/workreimbursement/treeForm/new/"+view;
+			}
+		}else{
+			// 比较当前日期是否在2025年10月1日之后
+			if (DateTimeUtil.isAfterOctoberFirst()) {
+				return "modules/workreimbursement/treeForm/new/"+view;
+			}
+		}
 		return "modules/workreimbursement/new/"+view;
 	}
 

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -172,6 +172,9 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
     public WorkStaffBasicInfo get(String id) {
         WorkStaffBasicInfo workStaffBasicInfo = super.get(id);
         if (null != workStaffBasicInfo) {
+            if (StringUtils.isNotBlank(workStaffBasicInfo.getPicture())) {
+                workStaffBasicInfo.setPictureStr(new OSSClientUtil().getFileTemporaryLookUrl(workStaffBasicInfo.getPicture()));
+            }
             if (StringUtils.isNotBlank(workStaffBasicInfo.getHandSignature())) {
                 workStaffBasicInfo.setHandSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + workStaffBasicInfo.getHandSignature()));
             }

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -280,6 +280,8 @@ public class WorkStaffBasicInfoController extends BaseController {
 		String roleNameStr = StringUtils.join(roleNameList, "，");
 		workStaffBasicInfo.setRoleName(roleNameStr);
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
+		System.out.println(workStaffBasicInfo.getPicture());
+		System.out.println(workStaffBasicInfo.getPictureStr());
 		return "modules/workstaff/workStaffBasicInfoView";
 	}
 

src/main/resources/mappings/modules/workreimbursement/ReimbursementVATTaxDao.xml

@@ -21,7 +21,8 @@
 		a.invoice_unit AS "invoiceUnit",
 		a.reimbursement_type AS "reimbursementType",
 		a.invoice_project_name AS "invoiceProjectName",
-		a.remarks AS "remarks"
+		a.remarks AS "remarks",
+		a.parent_id AS "parentId"
 	</sql>
 	
 	<sql id="ReimbursementVATTaxJoins">
@@ -94,7 +95,8 @@
 			invoice_date,
 			invoice_unit,
 			reimbursement_type,
-			invoice_project_name
+			invoice_project_name,
+			parent_id
 		) VALUES (
 			#{id},
 			#{invoiceCode},
@@ -113,7 +115,8 @@
 			#{invoiceDate},
 			#{invoiceUnit},
 			#{reimbursementType},
-			#{invoiceProjectName}
+			#{invoiceProjectName},
+			#{parentId}
 		)
 	</insert>
 	
@@ -132,7 +135,8 @@
 			invoice_date = #{invoiceDate},
 			invoice_unit = #{invoiceUnit},
 			reimbursement_type = #{reimbursementType},
-			invoice_project_name = #{invoiceProjectName}
+			invoice_project_name = #{invoiceProjectName},
+			parent_id = #{parentId}
 		WHERE id = #{id}
 	</update>
 	

src/main/resources/mappings/modules/workreimbursement/WorkAccountDao.xml

@@ -6,6 +6,8 @@
 		a.id AS "id",
 		a.type AS "type",
 		a.money AS "money",
+		a.e_invoice_money AS "eInvoiceMoney",
+		a.invoice_money AS "invoiceMoney",
 		a.financial_subjects AS "financialSubjects",
 		a.money_abstract AS "moneyAbstract",
 		a.tax AS "tax",
@@ -19,6 +21,8 @@
 		a.del_flag AS "delFlag",
 		a.project_id as "project.id",
 		a.bills as "bills",
+		a.e_invoice_bills as "eInvoiceBills",
+		a.invoice_bills as "invoiceBills",
 		a.evection_number as "evectionNumber",
 		a.project_radio as "projectRadio",
 		a.reimburse_remarks as "reimburseRemarks",
@@ -110,6 +114,8 @@
 			id,
 			type,
 			money,
+			e_invoice_money,
+			invoice_money,
 			financial_subjects,
 			money_abstract,
 			tax,
@@ -124,6 +130,8 @@
 			project_id,
 			reimbursement_name,
 			bills,
+			e_invoice_bills,
+			invoice_bills,
 			evection_number,
 			office_id,
 			project_radio,
@@ -132,6 +140,8 @@
 			#{id},
 			#{type},
 			#{money},
+			#{eInvoiceMoney},
+			#{invoiceMoney},
 			#{financialSubjects},
 			#{moneyAbstract},
 			#{tax},
@@ -146,6 +156,8 @@
 			#{project.id},
 			#{reimbursementName},
 			#{bills},
+			#{eInvoiceBills},
+			#{invoiceBills},
 			#{evectionNumber},
 			#{officeId},
 			#{projectRadio},
@@ -174,6 +186,12 @@
 		<if test="money != null">
 			money = #{money},
 		</if>
+		<if test="eInvoiceMoney != null">
+			e_invoice_money = #{eInvoiceMoney},
+		</if>
+		<if test="invoiceMoney != null">
+			invoice_money = #{invoiceMoney},
+		</if>
 		<if test="financialSubjects != null and financialSubjects != ''">
 			financial_subjects = #{financialSubjects},
 		</if>
@@ -197,6 +215,12 @@
 		<if test="bills != null and bills != ''">
 			bills = #{bills},
 		</if>
+		<if test="eInvoiceBills != null and eInvoiceBills != ''">
+			e_invoice_bills = #{eInvoiceBills},
+		</if>
+		<if test="invoiceBills != null and invoiceBills != ''">
+			invoice_bills = #{invoiceBills},
+		</if>
 		<if test="evectionNumber != null and evectionNumber != ''">
 			evection_number = #{evectionNumber},
 		</if>

src/main/webapp/static/oss/ossupload.js

@@ -2982,17 +2982,35 @@ function multiTypeTest (ossClient, storeAs, file,attachmentId,attachmentFlag,upl
 };
 
 
-
-
-
-
-
-
-
-
-
-
-
+/**
+ * 文件名称处理
+ * @param file
+ * @returns {*}
+ */
+function fileNameDispose(file){
+    // 处理文件名
+    file.name.replace(" ", "");
+    file.name.replace(/—/g, "");
+    var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g, "'").replace(/\“|\”/g, "");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g, "(").replace(/\】/g, ")").replace(/\｛/g, "(").replace(/\｝/g, ")");
+    fileName = fileName.replace(/\[/g, "(").replace(/\]/g, ")").replace(/\{/g, "(").replace(/\}/g, ")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g, ",").replace(/：/g, ":");
+    //将中文——转换为英文-
+    fileName = fileName.replace(/—/g, "-");
+    fileName = fileName.replace(/……/g, "");
+    fileName = fileName.replace(/±/g, "");
+    fileName = fileName.replace(/#/g, "");
+    fileName = fileName.replace(/%/g, "");
+    fileName = fileName.replace(/Π/g, "");
+    fileName = fileName.replace(/π/g, "");
+    fileName = fileName.replace(/·/g, ".");
+
+    return fileName;
+}
 
 
 

src/main/webapp/webpage/include/head.jsp

@@ -93,13 +93,13 @@
             document.write('<script type="text/javascript" src="${ctxStatic}/oss/lib/crypto1/hmac/hmac.js"><\/script>');
             document.write('<script type="text/javascript" src="${ctxStatic}/oss/lib/crypto1/sha1/sha1.js"><\/script>');
             document.write('<script type="text/javascript" src="${ctxStatic}/oss/lib/base64.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ie-ossupload.js?21"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ie-ossupload.js?22"><\/script>');
         }
         else
         {
              document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
             document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?21"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?22"><\/script>');
             /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
         }
     }
@@ -107,7 +107,7 @@
     {
          document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
         document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?21"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?22"><\/script>');
         /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
     }
 

src/main/webapp/webpage/include/ossTools.jsp

@@ -9,4 +9,4 @@
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/plupload.dev.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/upload.js"></script>
-<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?21"></script>
+<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?22"></script>

src/main/webapp/webpage/modules/projectcontentinfo/achievementFileDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?21"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?22"></script>
 	<style>
 		label.error{
 			top:40px;

src/main/webapp/webpage/modules/projectcontentinfo/basedDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?21"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?22"></script>
 	<style>
 		label.error{
 			top:40px;

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -20,7 +20,7 @@
     <meta name="description" content="JeePlus，采用spring mvc+mybatis+shiro+bootstrap，集成代码生成器的快速开发平台">
 
 <%-- 添加dify AI对话窗口 --%>
-    <script>
+    <%--<script>
         window.difyChatbotConfig = {
             token: 'Yl0XaVnhykBRU2Xl',
             baseUrl: 'http://3081089em4.wicp.vip:21548'
@@ -39,7 +39,7 @@
             width: 64rem !important;
             height: 60rem !important;
         }
-    </style>
+    </style>--%>
     <script type="text/javascript">
         $(document).ready(function() {
             if('${fns:getDictLabel(cookie.theme.value,'theme','默认主题')}' == '天蓝主题'){

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoDirectlyView.jsp

@@ -139,7 +139,7 @@
                                         <c:choose>
                                             <c:when test="${not empty workStaffBasicInfo.picture}">
                                                 <%--<span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>--%>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}" />
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.pictureStr}" />
                                             </c:when>
                                             <c:otherwise>
                                                 <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png" />

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -12,6 +12,8 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
             cacuAge('${workStaffBasicInfo.idCard}','1');
+
+            console.log('${workStaffBasicInfo}')
 		});
 	</script>
     <script type="text/javascript">
@@ -139,7 +141,7 @@
                                         <c:choose>
                                             <c:when test="${not empty workStaffBasicInfo.picture}">
                                                 <%--<span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>--%>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}" />
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.pictureStr}" />
                                             </c:when>
                                             <c:otherwise>
                                                 <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png" />