苏州签章添加上海项目功能调整

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

@@ -118,7 +118,7 @@ public class ImportExcelNew {
 	 * @throws InvalidFormatException
 	 * @throws IOException
 	 */
-	public List ImportExcelNew(MultipartFile multipartFile, int headerNum, int sheetIndex, String type)
+	public List ImportExcelNews(MultipartFile multipartFile, int headerNum, int sheetIndex, String type)
 			throws InvalidFormatException, IOException {
 		return this.list(multipartFile.getOriginalFilename(), multipartFile.getInputStream(), headerNum, sheetIndex, type);
 	}
@@ -198,48 +198,52 @@ public class ImportExcelNew {
 						}
 
 						if(sheet.getRow(7).getCell(i) != null) {
-							projectReportSignatureInfo.setDescriptionOfDeduction(sheet.getRow(7).getCell(i).toString());
+							projectReportSignatureInfo.setContractDate(sheet.getRow(7).getCell(i).toString());
 						}
 
 						if(sheet.getRow(8).getCell(i) != null) {
-							if(sheet.getRow(8).getCell(i).getCellType()==0) {
-								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(8).getCell(i))) {
-									projectReportSignatureInfo.setStampDate(sheet.getRow(8).getCell(i).getDateCellValue());
-								}
-							}
+							projectReportSignatureInfo.setDescriptionOfDeduction(sheet.getRow(8).getCell(i).toString());
 						}
+
 						if(sheet.getRow(9).getCell(i) != null) {
-							projectReportSignatureInfo.setPrintQuantity(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.setAgreedStartDate(sheet.getRow(10).getCell(i).getDateCellValue());
+							if(sheet.getRow(9).getCell(i).getCellType()==0) {
+								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(9).getCell(i))) {
+									projectReportSignatureInfo.setStampDate(sheet.getRow(9).getCell(i).getDateCellValue());
 								}
 							}
 						}
+						if(sheet.getRow(10).getCell(i) != null) {
+							projectReportSignatureInfo.setPrintQuantity(sheet.getRow(10).getCell(i).toString());
+						}
 						if(sheet.getRow(11).getCell(i) != null) {
 							if(sheet.getRow(11).getCell(i).getCellType()==0) {
 								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(11).getCell(i))) {
-									projectReportSignatureInfo.setAgreedEndDate(sheet.getRow(11).getCell(i).getDateCellValue());
+									projectReportSignatureInfo.setAgreedStartDate(sheet.getRow(11).getCell(i).getDateCellValue());
 								}
 							}
 						}
-
 						if(sheet.getRow(12).getCell(i) != null) {
-							projectReportSignatureInfo.setConsultant(sheet.getRow(12).getCell(i).toString());
+							if(sheet.getRow(12).getCell(i).getCellType()==0) {
+								if (HSSFDateUtil.isCellDateFormatted(sheet.getRow(12).getCell(i))) {
+									projectReportSignatureInfo.setAgreedEndDate(sheet.getRow(12).getCell(i).getDateCellValue());
+								}
+							}
 						}
+
 						if(sheet.getRow(13).getCell(i) != null) {
-							projectReportSignatureInfo.setSelfCalibrationOpinion(sheet.getRow(13).getCell(i).toString());
+							projectReportSignatureInfo.setConsultant(sheet.getRow(13).getCell(i).toString());
 						}
 						if(sheet.getRow(14).getCell(i) != null) {
-							projectReportSignatureInfo.setReviewOpinion(sheet.getRow(14).getCell(i).toString());
+							projectReportSignatureInfo.setSelfCalibrationOpinion(sheet.getRow(14).getCell(i).toString());
 						}
 						if(sheet.getRow(15).getCell(i) != null) {
-							projectReportSignatureInfo.setSettlementPricingBasisDocument(sheet.getRow(15).getCell(i).toString());
+							projectReportSignatureInfo.setReviewOpinion(sheet.getRow(15).getCell(i).toString());
 						}
 						if(sheet.getRow(16).getCell(i) != null) {
-							projectReportSignatureInfo.setCalculateValuationBasisDocument(sheet.getRow(16).getCell(i).toString());
+							projectReportSignatureInfo.setSettlementPricingBasisDocument(sheet.getRow(16).getCell(i).toString());
+						}
+						if(sheet.getRow(17).getCell(i) != null) {
+							projectReportSignatureInfo.setCalculateValuationBasisDocument(sheet.getRow(17).getCell(i).toString());
 						}
 						projectReportSignatureInfo.setType("2");
 						projectReportSignatureInfo.preInsert();

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

@@ -1647,7 +1647,13 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
             }else{
                 data.put("developmentOrganization","");
             }
-            //施工单位名称
+            //合同签订日期
+            if(null != projectReportSignatureInfo && null != projectReportSignatureInfo.getContractDate()){
+                data.put("contractSignedDate",projectReportSignatureInfo.getContractDate());
+            }else{
+                data.put("contractSignedDate","");
+            }
+            //施工单位
             if(StringUtils.isNotBlank(projectReportSignatureInfo.getConstructionUnit())){
                 data.put("constructionUnit",projectReportSignatureInfo.getConstructionUnit());
             }else{

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

@@ -560,6 +560,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 							Long date2TimeLong = date2.getTime();
 							//计算未归档天数
 							Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+							if("0".equals(info.getProjectReportRecordStatus()) && endTime >0){
+								info.setPaperFilingStatus("6");
+							}else if("5".equals(info.getProjectReportRecordStatus()) && endTime >0){
+								info.setPaperFilingStatus("7");
+							}
 							endTime = endTime - endingAdventRecordCount;
 							info.setNoArchivedDays(endTime.toString());
 						} catch (ParseException e) {
@@ -574,6 +579,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 							Long date2TimeLong = date2.getTime();
 							//计算未归档天数
 							Long endTime = (dateTimeLong - date2TimeLong) / (24 * 60 * 60 * 1000);
+							if("0".equals(info.getProjectReportRecordStatus()) && endTime >0){
+								info.setPaperFilingStatus("6");
+							}else if("5".equals(info.getProjectReportRecordStatus()) && endTime >0){
+								info.setPaperFilingStatus("7");
+							}
 							endTime = endTime - endingAdventRecordCount;
 							info.setNoArchivedDays(endTime.toString());
 						} catch (ParseException e) {
@@ -591,6 +601,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 							Long date2TimeLong = date2.getTime();
 							//计算未归档天数
 							Long endTime = (dateTimeLong - date2TimeLong)/(24*60*60*1000);
+							if("0".equals(info.getPaperFilingStatus()) && endTime >0){
+								info.setPaperFilingStatus("6");
+							}else if("5".equals(info.getPaperFilingStatus()) && endTime >0){
+								info.setPaperFilingStatus("7");
+							}
 							endTime = endTime - endingAdventRecordACount;
 							info.setPaperNoArchivedDays(endTime.toString());
 						} catch (ParseException e) {

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

@@ -844,7 +844,7 @@ public class RuralProjectMessageElectronicSealController extends BaseController
     public String importFile(MultipartFile file, RedirectAttributes redirectAttributes,String concealType) {
         try {
             ImportExcelNew importExcelNew = new ImportExcelNew();
-            List<ProjectReportSignatureInfo> list = importExcelNew.ImportExcelNew(file,1,0, concealType);  //只处理file 1不要也可以,0为sheet编号
+            List<ProjectReportSignatureInfo> list = importExcelNew.ImportExcelNews(file,1,0, concealType);  //只处理file 1不要也可以,0为sheet编号
 
             //对数据进行处理
             String resultStr = ruralProjectMessageElectronicSealService.disposeImportBRuralProjectRecords(list,concealType);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/yanChengSignature/RuralProjectMessageElectronicSealYCController.java

@@ -804,7 +804,7 @@ public class RuralProjectMessageElectronicSealYCController extends BaseControlle
     public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
         try {
             ImportExcelNew importExcelNew = new ImportExcelNew();
-            List<ProjectReportSignatureInfo> list = importExcelNew.ImportExcelNew(file,1,0,"");  //只处理file 1不要也可以,0为sheet编号
+            List<ProjectReportSignatureInfo> list = importExcelNew.ImportExcelNews(file,1,0,"");  //只处理file 1不要也可以,0为sheet编号
 
             //对数据进行处理
             String resultStr = ruralProjectMessageElectronicSealYCService.disposeImportBRuralProjectRecords(list);

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1318,6 +1318,7 @@ public class WorkFullManageController extends BaseController {
 				data.put("consultantName"+i,"");
 				data.put("consultantProfession"+i,"");
 				data.put("consultantQualification"+i,"");
+				data.put("handSignature1",blankBase64);
 			}
 		}
 		//查询陈红星陈总的用户信息
@@ -1364,6 +1365,8 @@ public class WorkFullManageController extends BaseController {
 			if(org.apache.commons.lang3.StringUtils.isNotBlank(currentConsultant.getZixunyuan())){
 				String base64String = workFullManageService.base64String(currentConsultant.getZixunyuan());
 				data.put("handSignature2",base64String);
+			}else{
+				data.put("handSignature2",blankBase64);
 			}
 
 			if(StringUtils.isBlank(currentConsultant.getAuditOpinion())){
@@ -1381,6 +1384,7 @@ public class WorkFullManageController extends BaseController {
 			data.put("projectYear","");
 			data.put("projectMonth","");
 			data.put("projectDay","");
+			data.put("handSignature2",blankBase64);
 		}
 
 		if("1".equals(ruralProjectRecords.getSubmitMoney())){

src/main/java/com/jeeplus/modules/workinvoice/dao/WorkInvoiceDao.java

@@ -138,5 +138,10 @@ public interface WorkInvoiceDao extends CrudDao<WorkInvoice> {
 	//部门级 查询开票报表的条数
 	Integer findDepartmentBillingReportPageCount(@Param("WorkInvoice") WorkInvoice workInvoice, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo, @Param("officeIdd") String officeIdd, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("newlyAdded")String newlyAdded, @Param("collectionThisMonth")String collectionThisMonth);
 
-
+	/**
+	 * 获取发票开户银行信息
+	 * @param bankName
+	 * @return
+	 */
+	String getBankNameByNameOrId(String bankName);
 }

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

@@ -3016,4 +3016,8 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 
 	}
 
+	public String getBankNameByNameOrId(String bankName){
+		return dao.getBankNameByNameOrId(bankName);
+	}
+
 }

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -309,6 +309,11 @@ public class WorkInvoiceAllController extends BaseController {
 					break;
 				}
 			}
+			//获取发票开户银行信息
+			String bankName = invoiceService.getBankNameByNameOrId(workInvoice.getBank());
+			if(StringUtils.isNotBlank(bankName)){
+				workInvoice.setBank(bankName);
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
 			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllTwoController.java

@@ -284,6 +284,11 @@ public class WorkInvoiceAllTwoController extends BaseController {
 					break;
 				}
 			}
+			//获取发票开户银行信息
+			String bankName = invoiceService.getBankNameByNameOrId(workInvoice.getBank());
+			if(StringUtils.isNotBlank(bankName)){
+				workInvoice.setBank(bankName);
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
 			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -345,6 +345,11 @@ public class WorkInvoiceController extends BaseController {
 					break;
 				}
 			}
+			//获取发票开户银行信息
+			String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
+			if(StringUtils.isNotBlank(bankName)){
+				workInvoice.setBank(bankName);
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
 			ProcessInstance processInstance = actTaskService.getProcIns(workInvoice.getProcessInstanceId());

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -308,6 +308,11 @@ public class WorkInvoiceTwoController extends BaseController {
 					break;
 				}
 			}
+			//获取发票开户银行信息
+			String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
+			if(StringUtils.isNotBlank(bankName)){
+				workInvoice.setBank(bankName);
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
 			ProcessInstance processInstance = actTaskService.getProcIns(workInvoice.getProcessInstanceId());

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

@@ -1866,6 +1866,11 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/workinvoice/workInvoiceView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 
+						//获取发票开户银行信息
+						String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
+						if(StringUtils.isNotBlank(bankName)){
+							workInvoice.setBank(bankName);
+						}
 						List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
 						for (MainDictDetail dictDetail: billingContentList) {
 							if(workInvoice.getBillingContent().equals(dictDetail.getValue())){

src/main/resources/freemarker/projectHSSignature.ftl

@@ -1198,7 +1198,7 @@
 								<w:sz w:val="24"/>
 								<w:szCs w:val="24"/>
 							</w:rPr>
-							<w:t>20xx年xx月x</w:t>
+							<w:t>${contractSignedDate}</w:t>
 						</w:r>
 						<w:r>
 							<w:rPr>
@@ -1208,7 +1208,7 @@
 								<w:sz w:val="24"/>
 								<w:szCs w:val="24"/>
 							</w:rPr>
-							<w:t>日组织建设、由</w:t>
+							<w:t>组织建设、由</w:t>
 						</w:r>
 						<w:r>
 							<w:rPr>

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

@@ -3265,7 +3265,8 @@
 		,ifnull(prrd.status,0) as "downProjectReportRecordStatus",
 		prrd.file_num as recodeNum,
 		prr.process_instance_id as prrProcessInstanceId,
-		prrd.process_instance_id as prrdProcessInstanceId
+		prr.accomplish_date as "projectReportRecordAuditDate"
+		,prrd.process_instance_id as prrdProcessInstanceId
 		,prd.id as prdId
 		,prr.id as prrId
 		,prrd.id as prrdId

src/main/resources/mappings/modules/statement/StatementCompanyComprehensiveDao.xml

@@ -2322,9 +2322,8 @@
 			a.del_flag=0
 			and a.status = 5
 			and a.submit_money = 2
-			and a.paper_filing_status != 7
-			AND a.paper_filing_status != '10'
-			AND a.paper_filing_status != '11'
+			and (a.paper_filing_status is null
+			or a.paper_filing_status not in ('7','10','11'))
 			and a.over_paper_filing_status = 1
 			and pmdrd.id is null
 		</where>

src/main/resources/mappings/modules/workclientinfo/WorkClientBankDao.xml

@@ -169,7 +169,7 @@
 		<include refid="workClientBankColumns"/>
 		FROM work_client_bank a
 		<include refid="workClientBankJoins"/>
-		WHERE a.our_bank = #{bankName}
+		WHERE a.id = #{bankName}
 		and a.client_id = #{clientId}
 		order by a.update_date desc
 		limit 1

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

@@ -2628,4 +2628,8 @@
 			${WorkInvoice.sqlMap.dsf}
 		</where>
 	</select>
+
+	<select id="getBankNameByNameOrId" resultType="java.lang.String">
+		select our_bank from work_client_bank where our_bank = #{bankName} or id = #{bankName} limit 1
+	</select>
 </mapper>

src/main/webapp/WEB-INF/tags/table/importExcelSZSHImport.tag

@@ -15,7 +15,7 @@
 	<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
 		<br/>
 		<div class="layui-form-item" style="text-align:center; line-height: 41px;">
-			<label class="layui-form-label" style="vertical-align:middle;display:inline-block;"><span class="require-item" style="color:red;font-size: 20px;">*</span>导入类型</label>
+			<label class="layui-form-label  abc" style="vertical-align:middle;display:inline-block;"><span class="require-item" style="color:red;font-size: 20px;">*</span>导入类型</label>
 			<select id="concealType" name="concealType">
 				<option value="">请选择</option>
 				<option value="js" selected="">江苏电力模板导入</option>
@@ -28,6 +28,9 @@
 </div>
 <script type="text/javascript">
 	$(document).ready(function() {
+
+		$("#importForm2 .layui-select-title").css("display","none");
+
 		$("#btnImport").click(function(){
 			top.layer.open({
 				type: 1,

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

@@ -928,6 +928,12 @@
                 </div>
 
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">合同签订日期：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false" style="background-color: #fff" id="contractDate" name="contractDate" class="form-control layui-input" value="${projectReportSignatureInfo.contractDate}" />
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label ">盖章日期：</label>
                     <div class="layui-input-block">
                         <input class="laydate-icondate form-control layui-input layer-date laydate-icon"  style="background-color: #fff" readonly="true" id="stampDate" name="stampDate" value="<fmt:formatDate value="${projectReportSignatureInfo.stampDate}" pattern="yyyy-MM-dd"/>">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -39,7 +39,6 @@
 				var form = layui.form;
 			})
 
-			$(".layui-select-title").css("display","none");
 
 		});
 

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

@@ -104,8 +104,8 @@
 					$('#bank').html('<option value="">请选择开户行信息</option>')
 					//对选中开票单位的银行做级联操作
 					for (var info in data){
-						if(data[info].ourBank == '${workInvoice.bank}'){
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank,true,true));
+						if(data[info].id == '${workInvoice.bank}'){
+							$('#bank').append(new Option(data[info].ourBank,data[info].id,true,true));
 							$("#bankNumber").val(data[info].bankNumber);
 							if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
 								$('#bankRemarks').html('备注：' + data[info].remarks);
@@ -113,7 +113,7 @@
 								$('#bankRemarks').html('');
 							}
 						}else{
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank));
+							$('#bank').append(new Option(data[info].ourBank,data[info].id));
 						}
 					}
 

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

@@ -118,8 +118,8 @@
 					$('#bank').html('<option value="">请选择开户行信息</option>')
 					//对选中开票单位的银行做级联操作
 					for (var info in data){
-						if(data[info].ourBank == '${workInvoice.bank}'){
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank,true,true));
+						if(data[info].id == '${workInvoice.bank}'){
+							$('#bank').append(new Option(data[info].ourBank,data[info].id,true,true));
 							$("#bankNumber").val(data[info].bankNumber);
 							if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
 								$('#bankRemarks').html('备注：' + data[info].remarks);
@@ -127,7 +127,7 @@
 								$('#bankRemarks').html('');
 							}
 						}else{
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank));
+							$('#bank').append(new Option(data[info].ourBank,data[info].id));
 						}
 					}
 

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

@@ -163,11 +163,12 @@
 				});
 
 				window.bankShow = function (data){
+					console.log('开户行列表')
 					$('#bank').html('<option value="">请选择开户行信息</option>')
 					//对选中开票单位的银行做级联操作
 					for (var info in data){
-						if(data[info].ourBank == '${workInvoice.bank}'){
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank,true,true));
+						if(data[info].id == '${workInvoice.bank}'){
+							$('#bank').append(new Option(data[info].ourBank,data[info].id,true,true));
 							$("#bankNumber").val(data[info].bankNumber);
 							if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
 								$('#bankRemarks').html('备注：' + data[info].remarks);
@@ -175,7 +176,7 @@
 								$('#bankRemarks').html('');
 							}
 						}else{
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank));
+							$('#bank').append(new Option(data[info].ourBank,data[info].id));
 						}
 					}
 

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

@@ -114,8 +114,8 @@
 					$('#bank').html('<option value="">请选择开户行信息</option>')
 					//对选中开票单位的银行做级联操作
 					for (var info in data){
-						if(data[info].ourBank == '${workInvoice.bank}'){
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank,true,true));
+						if(data[info].id == '${workInvoice.bank}'){
+							$('#bank').append(new Option(data[info].ourBank,data[info].id,true,true));
 							$("#bankNumber").val(data[info].bankNumber);
 							if(null != data[info].remarks && undefined != data[info].remarks && '' != data[info].remarks){
 								$('#bankRemarks').html('备注：' + data[info].remarks);
@@ -123,7 +123,7 @@
 								$('#bankRemarks').html('');
 							}
 						}else{
-							$('#bank').append(new Option(data[info].ourBank,data[info].ourBank));
+							$('#bank').append(new Option(data[info].ourBank,data[info].id));
 						}
 					}