Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.collect.Lists;
+import com.google.gson.Gson;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
@@ -110,6 +111,8 @@ import com.jeeplus.modules.szCenterservice.service.szCloud.SzFlowRequest;
 import com.jeeplus.modules.szCenterservice.task.SzTaskFlowService;
 import com.jeeplus.modules.szCenterservice.utils.SzConvertServiceUtil;
 import com.jeeplus.modules.test.service.act.ActTestService;
+import com.jeeplus.modules.workOrder.dao.WorkOrderDao;
+import com.jeeplus.modules.workOrder.entity.WorkOrderProcessing;
 import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workadministrativeatamp.entity.WorkAdministrativeAtamp;
@@ -229,10 +232,8 @@ import com.jeeplus.modules.workregularapply.service.WorkRegularApplyService;
 import com.jeeplus.modules.workregularapply.service.WorkRegularScoreService;
 import com.jeeplus.modules.workreimbur.entity.WorkReimbur;
 import com.jeeplus.modules.workreimbur.service.WorkReimburService;
-import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementReplenish;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
+import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxStatusDao;
+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;
@@ -279,6 +280,7 @@ import javax.validation.ConstraintViolationException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 /**
  * 通知Controller
@@ -607,6 +609,10 @@ public class WorkProjectNotifyController extends BaseController {
 	@Autowired
 	private SzFlowRequest flowRequest;
 
+	@Autowired
+	private ReimbursementVATTaxStatusDao reimbursementVATTaxStatusDao;
+
+
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required = false) String id) {
 		WorkProjectNotify entity = null;
@@ -10623,10 +10629,42 @@ public class WorkProjectNotifyController extends BaseController {
 
 		}
 
+		String isChangeStatus = "0";
+		WorkActivityProcess workActivityProcess = new WorkActivityProcess();
+		workActivityProcess.setProcessInstanceId(workReimbursement.getProcessInstanceId());
+		workActivityProcess.setIsApproval("0");
+		List<WorkActivityProcess> lists = workActivityProcessService.findByProcInsIdAudit(workActivityProcess);
+		WorkActivityProcess workActivity = lists.get(0);
+		SysRoleActivity role = workActivity.getActivity().getRole();
+		String enname = role.getEnname();
+		if("cwzg".equals(enname) || "cwygevod".equals(enname)){
+			isChangeStatus = "1";
+		}
 		if(null != workReimbursement.getReimbursementElectronicInvoiceVATTaxes() && workReimbursement.getReimbursementElectronicInvoiceVATTaxes().size()>0){
+			List<ReimbursementVATTax> reimbursementVATTaxes = workReimbursement.getReimbursementVATTaxes();
+			ReimbursementVATTaxStatus reimbursementVATTaxStatus = new ReimbursementVATTaxStatus();
+			User currentUser = UserUtils.getUser();
+			reimbursementVATTaxStatus.setUserId(currentUser.getId());
+			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 : workReimbursement.getReimbursementElectronicInvoiceVATTaxes()) {
+				//判断状态
+				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());
@@ -10641,6 +10679,7 @@ public class WorkProjectNotifyController extends BaseController {
 			model.addAttribute("identification","workreimbursement");
 			model.addAttribute("identificationName","报销审核意见");
 			model.addAttribute("pageFlag",workProjectNotify.getPageFlag());
+			model.addAttribute("isChangeStatus",isChangeStatus);
 						/*if (workReimbursement.getAct() != null && StringUtils.isNotBlank(workReimbursement.getAct().getTaskDefKey()) && "cw".equals(workReimbursement.getAct().getTaskDefKey())) {
 							return "modules/workreimbursement/new/workReimbursementCWNewAudit";
 						}*/

src/main/java/com/jeeplus/modules/workreimbursement/dao/ReimbursementVATTaxDao.java

@@ -7,6 +7,8 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
 
+import java.util.List;
+
 /**
  * 财务报销DAO接口
  * @author 孟祥越
@@ -15,5 +17,6 @@ import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
 @MyBatisDao
 public interface ReimbursementVATTaxDao extends CrudDao<ReimbursementVATTax> {
 
+    public List<ReimbursementVATTax> findListByReimburesmentId(ReimbursementVATTax reimbursementVATTax);
 	
 }

src/main/java/com/jeeplus/modules/workreimbursement/dao/ReimbursementVATTaxStatusDao.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.workreimbursement.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
+import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTaxStatus;
+
+import java.util.List;
+
+/**
+ * 财务报销数据状态DAO接口
+ * @author 孟祥越
+ * @version 2017-05-02
+ */
+@MyBatisDao
+public interface ReimbursementVATTaxStatusDao extends CrudDao<ReimbursementVATTaxStatus> {
+
+
+    public ReimbursementVATTaxStatus findByVatTaxId(ReimbursementVATTaxStatus reimbursementVATTaxStatus);
+
+    public List<ReimbursementVATTaxStatus> findList(ReimbursementVATTaxStatus reimbursementVATTaxStatus);
+
+    public void updateStatus(ReimbursementVATTaxStatus reimbursementVATTaxStatus);
+
+    public void saveVatTaxInfo(ReimbursementVATTaxStatus reimbursementVATTaxStatus);
+}

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

@@ -57,6 +57,15 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 	private String divIdType;
 	private String workAttachmentId;
 
+	private String vatTaxStatus;
+
+	public String getVatTaxStatus() {
+		return vatTaxStatus;
+	}
+
+	public void setVatTaxStatus(String vatTaxStatus) {
+		this.vatTaxStatus = vatTaxStatus;
+	}
 
 	@ExcelField(title="金额", align=2, sort=7)
 	public BigDecimal getMoney() {

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

@@ -0,0 +1,73 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.workreimbursement.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 财务报销的确认状态
+ * @author 孟祥越
+ * @version 2017-05-02
+ */
+public class ReimbursementVATTaxStatus extends DataEntity<ReimbursementVATTaxStatus> {
+
+	private static final long serialVersionUID = 1L;
+
+	private String id;
+	private String vatTaxId;
+	private String status;
+	private String userId;
+
+	private String reimbursementId;
+
+	public String getReimbursementId() {
+		return reimbursementId;
+	}
+
+	public void setReimbursementId(String reimbursementId) {
+		this.reimbursementId = reimbursementId;
+	}
+	@Override
+	public String getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getVatTaxId() {
+		return vatTaxId;
+	}
+
+	public void setVatTaxId(String vatTaxId) {
+		this.vatTaxId = vatTaxId;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+
+
+}

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

@@ -20,6 +20,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.SysRoleActivity;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
@@ -41,6 +42,7 @@ import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxDao;
+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.*;
@@ -65,6 +67,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 财务报销Service
@@ -129,6 +132,8 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
     @Autowired
     private WorkReimbursementTypeService workReimbursementTypeService;
 
+    @Autowired
+    private ReimbursementVATTaxStatusDao reimbursementVATTaxStatusDao;
     private static byte[] SYN_BYTE = new byte[0];
 
 
@@ -181,6 +186,29 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
 
                 }
             }
+
+            ReimbursementVATTaxStatus reimbursementVATTaxStatus = new ReimbursementVATTaxStatus();
+            User currentUser = UserUtils.getUser();
+            reimbursementVATTaxStatus.setUserId(currentUser.getId());
+            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
+                    ));
+
+
+            for (ReimbursementVATTax reimbursementVATTax : vatTaxDaoList) {
+                //判断状态
+                String status = statusMap.get(reimbursementVATTax.getId());
+                if (status != null) {
+                    reimbursementVATTax.setVatTaxStatus(status);
+                } else {
+                    reimbursementVATTax.setVatTaxStatus("0");  // 默认字符串"0"
+                }
+            }
             workReimbursement.setReimbursementVATTaxes(vatTaxList);
             workReimbursement.setReimbursementElectronicInvoiceVATTaxes(electronicInvoiceVATTaxesList);
             WorkClientAttachment workClientAttachment = new WorkClientAttachment();

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

@@ -9,16 +9,13 @@ import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
-import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
 import com.jeeplus.modules.workactivity.entity.Activity;
 import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
 import com.jeeplus.modules.workactivity.service.ActivityService;
@@ -34,10 +31,10 @@ import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxDao;
+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.HistoicFlowUtil;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.dao.WorkReimbursementBackDao;
 import com.jeeplus.modules.workreimbursementback.entity.WorkReimbursementBack;
@@ -105,6 +102,8 @@ public class WorkReimbursementNewService extends CrudService<WorkReimbursementDa
     private WorkReimbursementBackDao workReimbursementBackDao;
     @Autowired
     private WorkLoanDao workLoanDao;
+    @Autowired
+    private ReimbursementVATTaxStatusDao reimbursementVATTaxStatusDao;
 
     private static byte[] SYN_BYTE = new byte[0];
 

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

@@ -23,13 +23,16 @@ import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
+import com.jeeplus.modules.sys.entity.SysRoleActivity;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysmtree.entity.SysMtree;
 import com.jeeplus.modules.sysmtree.service.SysMtreeService;
 import com.jeeplus.modules.workactivity.entity.Activity;
+import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
 import com.jeeplus.modules.workactivity.service.ActivityService;
+import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
@@ -127,6 +130,9 @@ public class WorkReimbursementAllController extends BaseController {
 	protected WorkReimbursementService workRService;
 	@Autowired
 	private WorkReimbursementNewService workReimbursementNewService;
+	@Autowired
+	private WorkActivityProcessService workActivityProcessService;
+
 
 	@ModelAttribute
 	public WorkReimbursement get(@RequestParam(required=false) String id) {
@@ -387,6 +393,9 @@ public class WorkReimbursementAllController extends BaseController {
 		if(StringUtils.isBlank(workReimbursement.getReimbursementType())){
 			workReimbursement.setReimbursementType("1");
 		}
+
+
+
 		model.addAttribute("workReimbursement", workReimbursement);
 		return "modules/workreimbursement/all/"+view;
 	}

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

@@ -37,7 +37,7 @@
 	</select>
 	
 	<select id="findList" resultType="ReimbursementVATTax" >
-		SELECT 
+		SELECT
 			<include refid="ReimbursementVATTaxColumns"/>
 		FROM reimbursement_vat_tax a
 		<include refid="ReimbursementVATTaxJoins"/>
@@ -169,5 +169,18 @@
 	<select id="findUniqueByProperty" resultType="ReimbursementVATTax" statementType="STATEMENT">
 		select * FROM reimbursement_vat_tax  where ${propertyName} = '${value}'
 	</select>
-	
+
+
+	<select id="findListByReimburesmentId" resultType="ReimbursementVATTax" >
+		SELECT
+		<include refid="ReimbursementVATTaxColumns"/>
+		FROM reimbursement_vat_tax a
+		<include refid="ReimbursementVATTaxJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="reimbursementId != null and reimbursementId != ''">
+				AND a.work_reimbursement_id = #{reimbursementId}
+			</if>
+		</where>
+	</select>
 </mapper>

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

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxStatusDao">
+    
+	<sql id="ReimbursementVATTaxStatusColumns">
+		a.id AS "id",
+		a.vat_tax_id AS "vatTaxId",
+		a.reimbursement_id AS "reimbursementId",
+		a.status AS "status",
+		a.user_id AS "userId",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag"
+	</sql>
+	
+
+	<select id="get" resultType="ReimbursementVATTaxStatus" >
+		SELECT 
+			<include refid="ReimbursementVATTaxStatusColumns"/>
+		FROM reimbursement_vat_tax_status a
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTaxStatus" >
+		SELECT
+		<include refid="ReimbursementVATTaxStatusColumns"/>
+		FROM reimbursement_vat_tax_status a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="userId != null and userId != ''">
+				AND a.user_id = #{userId}
+			</if>
+			<if test="reimbursementId != null and reimbursementId != ''">
+				AND a.reimbursement_id = #{reimbursementId}
+			</if>
+		</where>
+	</select>
+
+	<select id="findByVatTaxId" resultType="com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTaxStatus" >
+		SELECT
+		<include refid="ReimbursementVATTaxStatusColumns"/>
+		FROM reimbursement_vat_tax_status a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="vatTaxId != null and vatTaxId != ''">
+				AND a.vat_tax_id = #{vatTaxId}
+			</if>
+			<if test="userId != null and userId != ''">
+				AND a.user_id = #{userId}
+			</if>
+		</where>
+	</select>
+
+	<update id="updateStatus">
+		UPDATE reimbursement_vat_tax_status SET
+			 status = #{status}
+			 WHERE vat_tax_id = #{vatTaxId}
+	</update>
+
+	<insert id="saveVatTaxInfo">
+		INSERT INTO reimbursement_vat_tax_status(
+			id,
+			vat_tax_id,
+			reimbursement_id,
+			status,
+			user_id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+					 #{id},
+					 #{vatTaxId},
+					 #{reimbursementId},
+					 #{status},
+					 #{userId},
+					 #{createBy.id},
+					 #{createDate},
+					 #{updateBy.id},
+					 #{updateDate},
+					 #{remarks},
+					 #{delFlag}
+				 )
+	</insert>
+
+	<insert id="insert">
+		INSERT INTO reimbursement_vat_tax_status(
+			id,
+		    vat_tax_id,
+			reimbursement_id,
+		    status,
+		    user_id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+		) VALUES (
+			#{id},
+			#{vatTaxId},
+			#{reimbursementId},
+			#{status},
+			#{userId},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE reimbursement_vat_tax_status SET
+			vat_tax_id = #{vatTaxId},
+			reimbursement_id = #{reimbursementId},
+			status = #{status},
+			user_id = #{userId},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM reimbursement_vat_tax_status
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE user_id = #{userId}
+			</otherwise>
+		</choose>
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE reimbursement_vat_tax_status SET
+			del_flag = #{DEL_FLAG_DELETE}
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE user_id = #{userId}
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

src/main/webapp/webpage/modules/workreimbursement/all/workReimbursementAllFormDetail.jsp

@@ -544,7 +544,7 @@
                 <tbody id="reimbursementElectronicInvoiceVATTaxes">
                 <c:if test="${not empty workReimbursement.reimbursementElectronicInvoiceVATTaxes}">
                     <c:forEach items="${workReimbursement.reimbursementElectronicInvoiceVATTaxes}" var="reimbursementElectronicInvoiceVATTaxes" varStatus="index">
-                        <tr id="reimbursementElectronicInvoiceVATTaxes${index.index}">
+                        <tr id="reimbursementElectronicInvoiceVATTaxes${index.index}" style="padding: 10px; margin: 5px;">
                                 <%--发票类型--%>
                             <td>
                                 <input id="reimbursementElectronicInvoiceVATTaxes${index.index}_invoiceType" onmouseover="this.title=this.value" readOnly="true" maxlength="30" name="reimbursementElectronicInvoiceVATTaxes[${index.index}].invoiceType" type="text" value="${reimbursementElectronicInvoiceVATTaxes.invoiceTypeStr}" onmouseover="this.title=this.value"  class="form-control "/>

src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewFormAdd.jsp

@@ -443,6 +443,7 @@
             }
 
         }
+        // 数电发票删除
         function delRowA(obj, prefix){
             var id = $(prefix+"_id");
             var delFlag = $(prefix+"_delFlag");