代码提交

src/main/java/com/jeeplus/common/service/BaseService.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.BaseEntity;
 import com.jeeplus.common.utils.JedisUtils;
+import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.OfficeDao;
 import com.jeeplus.modules.sys.entity.Office;
@@ -175,15 +176,29 @@ public abstract class BaseService {
                 }
             }
             //所有个人权限
-            for (int i = 0; i < selfRoleList.size(); i++) {
-                Role role = selfRoleList.get(i);
-                if (officeSet.contains(role.getOffice().getId())) {
-                    continue;
+            //针对合同列表（仅可看到本部门信息）
+            if(menuId.equals(MenuStatusEnum.WORK_CONTRACT_INFO.getValue())){
+                for (int i = 0; i < selfRoleList.size(); i++) {
+                    Role role = selfRoleList.get(i);
+                    if (officeSet.contains(role.getOffice().getId())) {
+                        continue;
+                    }
+                    if (i > 0 || sqlString.length() > 0) {
+                        sqlString.append("or ");
+                    }
+                    sqlString.append("(a.office_id='" + role.getOffice().getId() + "')");
                 }
-                if (i > 0 || sqlString.length() > 0) {
-                    sqlString.append("or ");
+            }else{
+                for (int i = 0; i < selfRoleList.size(); i++) {
+                    Role role = selfRoleList.get(i);
+                    if (officeSet.contains(role.getOffice().getId())) {
+                        continue;
+                    }
+                    if (i > 0 || sqlString.length() > 0) {
+                        sqlString.append("or ");
+                    }
+                    sqlString.append("(a.office_id='" + role.getOffice().getId() + "' and a.create_by='" + user.getId() + "')");
                 }
-                sqlString.append("(a.office_id='" + role.getOffice().getId() + "' and a.create_by='" + user.getId() + "')");
             }
 
             if (StringUtils.isNotBlank(sqlString.toString())) {

src/main/java/com/jeeplus/common/utils/excel/ImportExcelNew.java

@@ -656,33 +656,37 @@ public class ImportExcelNew {
 						if(sheet.getRow(7).getCell(i) != null) {
 							projectReportSignatureInfo.setMainContentsOfProject(sheet.getRow(7).getCell(i).toString());
 						}
-						//施工单位
+						//建设单位
 						if(sheet.getRow(8).getCell(i) != null) {
-							projectReportSignatureInfo.setConstructionUnit(sheet.getRow(8).getCell(i).toString());
+							projectReportSignatureInfo.setDevelopmentOrganization(sheet.getRow(8).getCell(i).toString());
 						}
-						//工程开始时间
+						//施工单位
 						if(sheet.getRow(9).getCell(i) != null) {
-							if(sheet.getRow(9).getCell(i).getCellType()==0) {
-								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(9).getCell(i))) {
-									projectReportSignatureInfo.setProjectStartDate(sheet.getRow(9).getCell(i).getDateCellValue());
-								}
-							}
+							projectReportSignatureInfo.setConstructionUnit(sheet.getRow(9).getCell(i).toString());
 						}
-						//工程竣工时间
+						//工程开始时间
 						if(sheet.getRow(10).getCell(i) != null) {
 							if(sheet.getRow(10).getCell(i).getCellType()==0) {
 								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(10).getCell(i))) {
-									projectReportSignatureInfo.setProjectEndDate(sheet.getRow(10).getCell(i).getDateCellValue());
+									projectReportSignatureInfo.setProjectStartDate(sheet.getRow(10).getCell(i).getDateCellValue());
 								}
 							}
 						}
-						//特殊事项说明
+						//工程竣工时间
 						if(sheet.getRow(11).getCell(i) != null) {
-							projectReportSignatureInfo.setDescriptionOfSpecialMatters(sheet.getRow(11).getCell(i).toString());
+							if(sheet.getRow(11).getCell(i).getCellType()==0) {
+								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(11).getCell(i))) {
+									projectReportSignatureInfo.setProjectEndDate(sheet.getRow(11).getCell(i).getDateCellValue());
+								}
+							}
 						}
-						//核减情况说明
+						//特殊事项说明
 						if(sheet.getRow(12).getCell(i) != null) {
-							projectReportSignatureInfo.setDescriptionOfDeduction(sheet.getRow(12).getCell(i).toString());
+							projectReportSignatureInfo.setDescriptionOfSpecialMatters(sheet.getRow(12).getCell(i).toString());
+						}
+						//核减情况说明
+						if(sheet.getRow(13).getCell(i) != null) {
+							projectReportSignatureInfo.setDescriptionOfDeduction(sheet.getRow(13).getCell(i).toString());
 						}
 						projectReportSignatureInfo.setType("3");
 						projectReportSignatureInfo.preInsert();

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -3286,6 +3286,13 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                 data.put("projectEndDate","");
             }
 
+            //建设单位
+            if(StringUtils.isNotBlank(projectReportSignatureInfo.getDevelopmentOrganization())){
+                data.put("developmentOrganization",projectReportSignatureInfo.getDevelopmentOrganization());
+            }else{
+                data.put("developmentOrganization","");
+            }
+
 
             String querySite = serverDomain+"/ruralProject/ruralProjectRecords/getDownloadProjectView?id="+projectReportData.getProject().getId();
             //生成二维码图片和doc文档 缓存文件的共用名称

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java

@@ -1162,7 +1162,12 @@ public class RuralProjectMessageElectronicSealController extends BaseController
             cfg.setDirectoryForTemplateLoading(path);
             //选择对应的ftl文件
             if("3".equals(type)){
-                template = cfg.getTemplate("projectInternalAuditSignature.ftl","UTF-8");
+                String developmentOrganization = (String) data.get("developmentOrganization");
+                if(StringUtils.isBlank(developmentOrganization)){
+                    template = cfg.getTemplate("projectInternalAuditSignature.ftl","UTF-8");
+                }else{
+                    template = cfg.getTemplate("projectInternalAuditSignatureNew.ftl","UTF-8");
+                }
             }
             File docFile = new File("报告号【"+number + "】内审报告签章.doc");
             FreemarkerUtil.generateFile(data,template,docFile);

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -3785,8 +3785,8 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 				// 将Date对象格式化为指定格式的字符串
 				String returnInvoiceDate = dateFormat.format(workInvoice.getInvoiceDate());
 
-				String notifyStr = "项目【"+ projectNameStr +"】。发票申请编号：" + workInvoice.getNumber() + "未收款。开票日期：" + returnInvoiceDate;
-				String titleStr = "项目【"+ projectNameStr +"】。发票申请编号：" + workInvoice.getNumber() + "未收款。开票日期：" + returnInvoiceDate + "。开票距今："+workInvoice.getAdventDate() + "天。";
+				String notifyStr = "项目【"+ projectNameStr +"】。发票申请编号：" + workInvoice.getNumber() + "， 开票金额：" + workInvoice.getMoney() + "元 未收款。开票日期：" + returnInvoiceDate;
+				String titleStr = "项目【"+ projectNameStr +"】。发票申请编号：" + workInvoice.getNumber() + "， 开票金额：" + workInvoice.getMoney() + "元 未收款。开票日期：" + returnInvoiceDate + "。开票距今："+workInvoice.getAdventDate() + "天。";
 
 				//根据标题查询通知信息中是否存在未读的信息，有则进行更新并对重复数量进行+1操作
 				WorkProjectNotify byTitleAndUnread = workProjectNotifyService.getByTitleAndUnread(notifyStr,workInvoice.getCreateBy().getId());
@@ -3833,6 +3833,8 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		Office zbdlbDepartment = officeService.getByName("招标代理部");
 		Office ycDepartment = officeService.getByName("盐城分公司");
 		Office szfgsDepartment = officeService.getByName("苏州分公司");
+		//查询苏州分公司下的所有部门
+		List<Office> szfgsChildrenOffice = officeService.getChildrenOfficeById(szfgsDepartment.getId());
 
 		BigDecimal allMoneyB = new BigDecimal("0");
 		BigDecimal firstDepartmentB = new BigDecimal("0");
@@ -3915,6 +3917,9 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 				otherOfficeList.add(zbdlbDepartment.getId());
 				otherOfficeList.add(ycDepartment.getId());
 				otherOfficeList.add(szfgsDepartment.getId());
+				for (Office office : szfgsChildrenOffice) {
+					otherOfficeList.add(office.getId());
+				}
 
 				//查询剩余部门当月开票金额总和
 				//盐城分公司开票金额

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

@@ -635,7 +635,7 @@ public class WorkProjectNotifyController extends BaseController {
 		workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
 		workProjectNotify.setRemarks("待审批");
 		//判断当前登录人是否有访问其他系统的权限
-		if (user.getOtherServiceFlag().equals("1")){
+		if (StringUtils.isNotBlank(user.getOtherServiceFlag()) && user.getOtherServiceFlag().equals("1")){
 			//中台数据查询
 			List<Map<String, Object>> cpa = queryTodoListCenter(new Page<WorkProjectNotify>(request, response),workProjectNotify, "sz", Global.getConfig("SZCLOUD_STATUS"),request,response);
 			if (cpa.size() > 0) {

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

@@ -107,4 +107,10 @@ public interface WorkReimbursementDao extends CrudDao<WorkReimbursement> {
 	 * @param workReimbursement
 	 */
 	void paymentSave(WorkReimbursement workReimbursement);
+
+	/**
+	 * 报销单付款/撤回付款
+	 * @param numberList
+	 */
+	List<ReimbursementVATTax> decideInvoiceVATTaxesByNumbers(@Param("numberList") List<String> numberList);
 }

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

@@ -2202,4 +2202,14 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     public WorkReimbursementadminupdatehistory getWorkReimbursementadminupdatehistoryById(String id){
         return dao.getWorkReimbursementadminupdatehistoryById(id);
     }
+
+    /**
+     * 查询管理员修改报销信息记录
+     * @param numberList
+     * @return
+     */
+    public List<ReimbursementVATTax> decideInvoiceVATTaxesByNumbers(List<String> numberList){
+
+        return dao.decideInvoiceVATTaxesByNumbers(numberList);
+    }
 }

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

@@ -1210,4 +1210,36 @@ public class WorkReimbursementController extends BaseController {
 	public Map<String,Object> updateAccountInfoById(String invoiceNumber) {
 		return workReimbursementService.updateAccountInfoById(invoiceNumber);
 	}
+
+	/**
+	 * 根据id修改报销详情中喝项目的关联关系信息
+	 * @param invoiceVATTaxesNumber
+	 * @return
+	 */
+	@RequestMapping(value = "decideInvoiceVATTaxesByNumbers", method=RequestMethod.POST)
+	@ResponseBody
+	public Map<String,Object> decideInvoiceVATTaxesByNumbers(String invoiceVATTaxesNumber) {
+		Map map = new HashMap();
+		map.put("success",true);
+		map.put("message","数电发票正常");
+		if(StringUtils.isNotBlank(invoiceVATTaxesNumber)){
+			String[] array = invoiceVATTaxesNumber.split(",");
+			// 将数组转换为 List
+			List<String> numberList = Arrays.asList(array);
+			Set<String> set = new HashSet<>();
+			if(numberList.size()>0){
+				List<ReimbursementVATTax> repetitionMessageList = workReimbursementService.decideInvoiceVATTaxesByNumbers(numberList);
+				for (ReimbursementVATTax vatTax : repetitionMessageList) {
+					set.add(vatTax.getInvoiceNumber());
+				}
+			}
+			ArrayList<String> strings = Lists.newArrayList(set);
+			String result = String.join(",", strings);
+			if(result.length()>0){
+				map.put("success",false);
+				map.put("message","数电发票编号为：" + result + "已进行上报，无法重复上报");
+			}
+		}
+		return map;
+	}
 }

src/main/resources/freemarker/massControl.ftl

@@ -158,7 +158,6 @@
 											<w:sz w:val="20"/>
 										</w:rPr>
 									</w:pPr>
-									<w:proofErr w:type="gramStart"/>
 									<w:r>
 										<w:rPr>
 											<w:rFonts w:ascii="宋体" w:hAnsi="宋体" w:cs="Arial" w:hint="eastAsia"/>
@@ -168,7 +167,6 @@
 										</w:rPr>
 										<w:t>${projectName}</w:t>
 									</w:r>
-									<w:proofErr w:type="gramEnd"/>
 
 								</w:p>
 							</w:tc>

src/main/resources/jeeplus.properties

@@ -7,7 +7,7 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://8.136.152.135:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://192.168.2.4:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 #jdbc.password=Xgcomdata10376@

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageElectronicSealDao.xml

@@ -87,6 +87,7 @@
 			a.project_start_date as "projectStartDate",
 			a.project_end_date as "projectEndDate",
 			a.decrease_in_accounting_fee as "decreaseInAccountingFee",
+			a.development_organization as "developmentOrganization",
 			a.type as "type"
 	</sql>
 
@@ -260,6 +261,7 @@
 			project_start_date,
 			project_end_date,
 			decrease_in_accounting_fee,
+			development_organization,
 			`type`
 		)values
 		<foreach collection="list" item="item" separator=",">
@@ -284,6 +286,7 @@
 			#{item.projectStartDate},
 			#{item.projectEndDate},
 			#{item.decreaseInAccountingFee},
+			#{item.developmentOrganization},
 			#{item.type}
 			)
 		</foreach>
@@ -747,6 +750,7 @@
 			project_end_date=#{projectEndDate},
 
 			decrease_in_accounting_fee=#{decreaseInAccountingFee},
+			development_organization=#{developmentOrganization},
 			`type` = #{type}
 			where project_report_id=#{projectReportId}
 	</update>

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -553,11 +553,11 @@
 			<!--<if test="officeId != null and officeId != ''">
 				AND so.id  = #{officeId}
 			</if>-->
-			<if test="money != null and money != ''">
+			<if test="moneyStr != null and moneyStr != ''">
 				AND a.money LIKE
-				<if test="dbName == 'oracle'">'%'||#{money}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{money}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{money},'%')</if>
+				<if test="dbName == 'oracle'">'%'||#{moneyStr}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{moneyStr}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{moneyStr},'%')</if>
 			</if>
 			<!--<if test="submitterId != null and submitterId != ''">
 				AND a.create_by = #{submitterId}
@@ -1153,8 +1153,11 @@
 				<if test="dbName == 'mssql'">'%'+#{widNumber}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{widNumber},'%')</if>
 			</if>
-			<if test="money != null and money != ''">
-				AND a.money = #{money}
+			<if test="moneyStr != null and moneyStr != ''">
+				AND a.money LIKE
+				<if test="dbName == 'oracle'">'%'||#{moneyStr}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{moneyStr}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{moneyStr},'%')</if>
 			</if>
 			<if test="(accountCheckingUserId != null and accountCheckingUserId != '') or (accountCheckingUserName != null and accountCheckingUserName != '')">
 				AND (a.account_checking_user_id = #{accountCheckingUserId} or sua.name like concat('%',#{accountCheckingUserName},'%'))
@@ -1527,11 +1530,11 @@
 			<if test="receiptMoney != null and receiptMoney != ''">
 				AND a.receipt_money = #{receiptMoney}
 			</if>
-			<if test="money != null and money != ''">
+			<if test="moneyStr != null and moneyStr != ''">
 				AND a.money LIKE
-				<if test="dbName == 'oracle'">'%'||#{money}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{money}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{money},'%')</if>
+				<if test="dbName == 'oracle'">'%'||#{moneyStr}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{moneyStr}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{moneyStr},'%')</if>
 			</if>
 			<if test="invoiceType != null and invoiceType != ''">
 				AND a.invoice_type = #{invoiceType}

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

@@ -999,6 +999,7 @@
 		left join sys_user su on su.id = a.submitter_id
 		<where>
 			a.del_flag = 0
+			and (a.`status` = 2 or a.`status` = 5)
 			and rvt.del_flag = 0
 			and rvt.reimbursement_type = 1
 			and rvt.invoice_number = #{invoiceNumber}
@@ -1095,4 +1096,39 @@
 		</choose>
 		where id = #{id}
 	</update>
+
+	<select id="decideInvoiceVATTaxesByNumbers" resultType="com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax">
+		SELECT
+		rvt.invoice_number as "invoiceNumber",
+		rvt.tax_amount as "taxAmount",
+		rvt.money as "money",
+		rvt.sum_money as "sumMoney",
+		rvt.invoice_type as "invoiceType",
+		rvt.invoice_date as "invoiceDate",
+		date_format(rvt.invoice_date,'%Y-%m-%d') as "invoiceDateStr",
+		rvt.invoice_unit as "invoiceUnit",
+		rvt.reimbursement_type as "reimbursementType",
+		rvt.invoice_project_name as "invoiceProjectName",
+		rvt.remarks as "remarks",
+		su.name as "submitterName",
+		a.status as "status",
+		a.id as "reimbursementId",
+		a.process_instance_id as "processInstanceId",
+		date_format(a.submitter_date,'%Y-%m-%d') as "submitterDate"
+		FROM reimbursement_vat_tax rvt
+		left join work_reimbursement a on rvt.work_reimbursement_id =a.id
+		left join sys_user su on su.id = a.submitter_id
+		<where>
+			a.del_flag = 0
+			and (a.`status` = 2 or a.`status` = 5)
+			and rvt.del_flag = 0
+			and rvt.reimbursement_type = 1
+			<if test="numberList!=null and numberList.size!=0">
+				and rvt.invoice_number in
+				<foreach collection="numberList" item="number" separator="," open="(" close=")">
+					#{number}
+				</foreach>
+			</if>
+		</where>
+	</select>
 </mapper>

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

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?22" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?23" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->
@@ -99,7 +99,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?12"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"><\/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?12"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"><\/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?12"></script>
+<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"></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?12"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"></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?12"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?13"></script>
 	<style>
 		label.error{
 			top:40px;

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectReportNSBGSignatureInfoForm.jsp

@@ -223,6 +223,12 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>建设单位：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  id="developmentOrganization" name="developmentOrganization" class="form-control layui-input required" value="${projectReportInternalAuditInfo.developmentOrganization}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>施工单位：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  id="constructionUnit" name="constructionUnit" class="form-control layui-input required" value="${projectReportInternalAuditInfo.constructionUnit}"/>

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

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?22" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?23" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

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

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?22" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?23" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoForm.jsp

@@ -285,7 +285,7 @@
 					
 					<td>
 						<input id="workContractAnnexList{{idx}}_url" name="workContractAnnexList[{{idx}}].url" type="hidden" value="{{row.url}}" maxlength="1000" class="form-control"/>
-						<sys:ckfinder input="workContractAnnexList{{idx}}_url" type="files" uploadPath="/workcontractinfo/workContractInfo" selectMultiple="true"/>
+						<sys:ckfinder input="workContractAnnexList{{idx}}_url" type="files" uploadPath="/workcontractinfo/workContractInfoworkcontractinfo/workContractInfo" selectMultiple="true"/>
 					</td>
 					
 					<td class="text-center" width="10">

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -473,7 +473,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">开票总金额：</label>
 							<div class="layui-input-block with-icon">
-								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
+								<form:input path="moneyStr" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoList.jsp

@@ -558,7 +558,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">开票总金额：</label>
 							<div class="layui-input-block with-icon">
-								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
+								<form:input path="moneyStr" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoList.jsp

@@ -601,7 +601,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">开票总金额：</label>
 							<div class="layui-input-block with-icon">
-								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
+								<form:input path="moneyStr" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceView.jsp

@@ -238,7 +238,7 @@
 				<div class="layui-item layui-col-sm6 redInvoice">
 					<label class="layui-form-label">关联发票号：</label>
 					<div class="layui-input-block">
-						<input id="invoiceNumberStr" htmlEscape="false" readonly="true" class="form-control layui-input" value=""/>
+						<input id="invoiceNumberStr" style="background-color: #f1f1f1" htmlEscape="false" readonly="true" class="form-control layui-input" value=""/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12">

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

@@ -199,6 +199,28 @@
                         flags= false;
                     }
                 }
+                if(electronicInvoiceArr.length>0){
+                    var numberArr = [];
+                    for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                        var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+                        numberArr.push(number)
+                    }
+                    //判定数据是否已经被发起或已完成报销申请
+                    $.ajax({
+                        type:'post',
+                        async: false,
+                        url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                        data:{
+                            "invoiceVATTaxesNumber":numberArr.join(",")
+                        },
+                        success:function(data){
+                            if(!data.success){
+                                parent.layer.msg(data.message, {icon: 5});
+                                flags= false;
+                            }
+                        }
+                    })
+                }
 
                 if (flags){
                     $("#inputForm").attr("action","${ctx}/workreimbursement/workReimbursementAll/save");

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

@@ -231,6 +231,33 @@
                 $("#reimbursementVATTaxes tr:visible .sumMoney").each(function () {
                     total= parseFloat($(this).val()) +total;
                 });
+
+                var decideFlag = false;
+                if(electronicInvoiceArr.length>0){
+                    var numberArr = [];
+                    for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                        var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+                        numberArr.push(number)
+                    }
+                    //判定数据是否已经被发起或已完成报销申请
+                    $.ajax({
+                        type:'post',
+                        async: false,
+                        url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                        data:{
+                            "invoiceVATTaxesNumber":numberArr.join(",")
+                        },
+                        success:function(data){
+                            if(!data.success){
+                                decideFlag = true
+                                parent.layer.msg(data.message, {icon: 5});
+                            }
+                        }
+                    })
+                }
+                if(decideFlag){
+                    return false;
+                }
                 var falt=0;
                 /*$("#workAccountList tr:visible").each(function () {
                     var v_id = $(this).attr("id");

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

@@ -199,6 +199,28 @@
                         flags= false;
                     }
                 }
+                if(electronicInvoiceArr.length>0){
+                    var numberArr = [];
+                    for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                        var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+                        numberArr.push(number)
+                    }
+                    //判定数据是否已经被发起或已完成报销申请
+                    $.ajax({
+                        type:'post',
+                        async: false,
+                        url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                        data:{
+                            "invoiceVATTaxesNumber":numberArr.join(",")
+                        },
+                        success:function(data){
+                            if(!data.success){
+                                parent.layer.msg(data.message, {icon: 5});
+                                flags= false;
+                            }
+                        }
+                    })
+                }
 
                 if (flags){
                     $("#inputForm").attr("action","${ctx}/workReimbursementNew/workReimbursementNew/save");

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

@@ -231,6 +231,33 @@
                 $("#reimbursementVATTaxes tr:visible .sumMoney").each(function () {
                     total= parseFloat($(this).val()) +total;
                 });
+                var decideFlag = false;
+                if(electronicInvoiceArr.length>0){
+                    var numberArr = [];
+                    for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                        var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+                        numberArr.push(number)
+                    }
+                    //判定数据是否已经被发起或已完成报销申请
+                    $.ajax({
+                        type:'post',
+                        async: false,
+                        url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                        data:{
+                            "invoiceVATTaxesNumber":numberArr.join(",")
+                        },
+                        success:function(data){
+                            if(!data.success){
+                                decideFlag = true
+                                parent.layer.msg(data.message, {icon: 5});
+                            }
+                        }
+                    })
+                }
+                if(decideFlag){
+                    return false;
+                }
+
                 var falt=0;
                 /*$("#workAccountList tr:visible").each(function () {
                     var v_id = $(this).attr("id");

src/main/webapp/webpage/modules/workreimbursement/replenish/workReimbursementReplenishCwAudit.jsp

@@ -222,6 +222,33 @@
 				$("#reimbursementVATTaxes tr:visible .sumMoney").each(function () {
 					total= parseFloat($(this).val()) +total;
 				});
+
+				var decideFlag = false;
+				if(electronicInvoiceArr.length>0){
+					var numberArr = [];
+					for(var i = 0;i < electronicInvoiceArr.length;i++) {
+						var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+						numberArr.push(number)
+					}
+					//判定数据是否已经被发起或已完成报销申请
+					$.ajax({
+						type:'post',
+						async: false,
+						url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+						data:{
+							"invoiceVATTaxesNumber":numberArr.join(",")
+						},
+						success:function(data){
+							if(!data.success){
+								decideFlag = true
+								parent.layer.msg(data.message, {icon: 5});
+							}
+						}
+					})
+				}
+				if(decideFlag){
+					return false;
+				}
 				var falt=0;
 				/*$("#workAccountList tr:visible").each(function () {
                     var v_id = $(this).attr("id");

src/main/webapp/webpage/modules/workreimbursement/specific/workReimbursementSpecificModifyApply.jsp

@@ -222,6 +222,33 @@
                 $("#reimbursementVATTaxes tr:visible .sumMoney").each(function () {
                     total= parseFloat($(this).val()) +total;
                 });
+
+                var decideFlag = false;
+                if(electronicInvoiceArr.length>0){
+                    var numberArr = [];
+                    for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                        var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+                        numberArr.push(number)
+                    }
+                    //判定数据是否已经被发起或已完成报销申请
+                    $.ajax({
+                        type:'post',
+                        async: false,
+                        url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                        data:{
+                            "invoiceVATTaxesNumber":numberArr.join(",")
+                        },
+                        success:function(data){
+                            if(!data.success){
+                                decideFlag = true
+                                parent.layer.msg(data.message, {icon: 5});
+                            }
+                        }
+                    })
+                }
+                if(decideFlag){
+                    return false;
+                }
                 var falt=0;
                 /*$("#workAccountList tr:visible").each(function () {
                     var v_id = $(this).attr("id");

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -191,6 +191,29 @@
                 for (let i = 0; i <electronicInvoiceArr.length ; i++) {
                     $('#reimbursementElectronicInvoiceVATTaxes' + i + '_invoiceType').attr("disabled",false);
                 }
+                if(electronicInvoiceArr.length>0){
+                    var numberArr = [];
+                    for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                        var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(5).val();
+                        numberArr.push(number)
+                    }
+                    //判定数据是否已经被发起或已完成报销申请
+                    $.ajax({
+                        type:'post',
+                        async: false,
+                        url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                        data:{
+                            "invoiceVATTaxesNumber":numberArr.join(",")
+                        },
+                        success:function(data){
+                            if(!data.success){
+                                parent.layer.msg(data.message, {icon: 5});
+                                flags= false;
+                            }
+                        }
+                    })
+                }
+
                 /*var electronicInvoiceArr = $("#reimbursementElectronicInvoiceVATTaxes tr:visible");
                 if(electronicInvoiceArr.length>0){
                     var flag = false;

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -334,22 +334,22 @@
                     xml += "<a href=\"${ctx}/workreimbursement/workReimbursementAll/paymentSave?id=" + d.id + "&paymentStatus=0\" onclick=\"return confirmx('是否确认对报销编号为 " + d.number + " 的报销信息进行撤回付款？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\">撤回付款</a>";
                 }
                 if (d.cancancel != undefined && d.cancancel == "1") {
-                    xml += "<a href=\"${ctx}/workreimbursement/workReimbursementAll/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\">撤回</a>";
+                    xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\">撤回</a>";
                 }
                 if (d.canedit1 != undefined && d.canedit1 == "1") {
-                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\">修改</a>";
+                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workReimbursementNew/workReimbursementNew/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\">修改</a>";
                 }
                 if (d.canedit2 != undefined && d.canedit2 == "1") {
-                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\">修改</a>";
+                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workReimbursementNew/workReimbursementNew/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\">修改</a>";
                 }
                 if (d.canedit3 != undefined && d.canedit3 == "1") {
-                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";
+                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workReimbursementNew/workReimbursementNew/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";
                 }
                 if (d.candelete != undefined && d.candelete == "1") {
-                    xml += "<a href=\"${ctx}/workreimbursement/workReimbursementAll/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该报销单吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\">删除</a>";
+                    xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该报销单吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\">删除</a>";
                 }
                 if (<%=admin%> && d.status == "5") {
-                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreAdminModify('管理员修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";
+                    xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogreAdminModify('管理员修改报销单', '${ctx}/workReimbursementNew/workReimbursementNew/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";
                 }
                 xml += "</div>";
                 return xml;

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -150,42 +150,32 @@
                 }
             }
             var electronicInvoiceArr = $("#reimbursementElectronicInvoiceVATTaxes tr:visible");
+
+            var decideFlag = false;
             if(electronicInvoiceArr.length>0){
-                var flag = false;
-                var countFlag = 0;
-                var list = "${workReimbursement.workAttachments}";
-                var size = (list.split('url')).length-1;
-                /*var files = $("#attachment_file")[0].files;
-                for(var i = 0;i<files.length;i++) {
-                    var file = files[i];
-                    //如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
-                    const spliceLength2 = file.name.lastIndexOf(".");
-                    var fileNameSuffix = file.name.slice(spliceLength2 + 1);
-                    if(fileNameSuffix === "xml" ) {
-                        flag = true;
-                        countFlag ++;
-                    }
+                var numberArr = [];
+                for(var i = 0;i < electronicInvoiceArr.length;i++) {
+                    var number = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("input").eq(3).val();
+                    numberArr.push(number)
                 }
-                if(!flag){
-                    var data = ${fns:toJson(workReimbursement.workAttachments)};//后端获取值
-                    for (var i=0; i<data.length; i++){
-                        //如果文件以xml文件结尾，则需要将该文件上传到后台进行数据处理后返回数据
-                        const spliceLength2 = data[i].attachmentName.lastIndexOf(".");
-                        var fileNameSuffix = data[i].attachmentName.slice(spliceLength2 + 1);
-                        if(fileNameSuffix === "xml" ) {
-                            flag = true;
-                            countFlag ++;
+                //判定数据是否已经被发起或已完成报销申请
+                $.ajax({
+                    type:'post',
+                    async: false,
+                    url:'${ctx}/workreimbursement/workReimbursement/decideInvoiceVATTaxesByNumbers',
+                    data:{
+                        "invoiceVATTaxesNumber":numberArr.join(",")
+                    },
+                    success:function(data){
+                        if(!data.success){
+                            decideFlag = true
+                            parent.layer.msg(data.message, {icon: 5});
                         }
                     }
-                }
-                if(!flag){
-                    parent.layer.msg("已填写电子发票信息，请上传对应发票的xml文件!", {icon: 5});
-                    flags= false;
-                }*/
-                /*if(countFlag < electronicInvoiceArr.length){
-                    parent.layer.msg("填写电子发票数据量与上传发票xml文件数量不符，请重新上传!", {icon: 5});
-                    flags= false;
-                }*/
+                })
+            }
+            if(decideFlag){
+                return false;
             }
 
             var trlen = $("#workAccountList tr").length;