开票功能修改

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -127,6 +127,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String signatureFileName;		//签章文件名称
 	private User signatureUploadFileUser;		//签章文件上传人信息
 	private Date signatureUploadDate;		//签章文件上传时间
+	private Date firstAuditDate;  //质量复核初次审核时间
 
 
 	public String getUpId() {
@@ -862,4 +863,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setSignatureUploadDate(Date signatureUploadDate) {
 		this.signatureUploadDate = signatureUploadDate;
 	}
+
+	public Date getFirstAuditDate() {
+		return firstAuditDate;
+	}
+
+	public void setFirstAuditDate(Date firstAuditDate) {
+		this.firstAuditDate = firstAuditDate;
+	}
 }

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

@@ -648,6 +648,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                 //判断是否存在撤回
                 if (com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportData.getId())){
                     ProjectReportData old = projectReportDataService.get(projectReportData.getId());
+                    projectReportData.setFirstAuditDate(old.getFirstAuditDate());
                     if (com.jeeplus.common.utils.StringUtils.isNotBlank(old.getProcessInstanceId())){
                         processInstanceId = old.getProcessInstanceId();
                     }
@@ -1037,9 +1038,15 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         projectReportData.setStatus("5");
         if (StringUtils.isBlank(projectReportData.getId())){
             projectReportData.preInsert();
+            //projectReportData.setFirstAuditDate(new Date());
             projectReportDataDao.insert(projectReportData);
+        }else{
+            /*if(null == projectReportData.getFirstAuditDate()){
+                projectReportData.setFirstAuditDate(new Date());
+            }*/
+            projectReportData.preUpdate();
+            projectReportDataDao.update(projectReportData);
         }
-        projectReportDataDao.update(projectReportData);
     }
 
     public String getReportToJson(Projectcontentinfo projectcontentinfo){

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

@@ -120,6 +120,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
             projectApprovalSignature.setStatus(1);
             dao.updateApprovalSignature(projectApprovalSignature);
+            return null;
         }
 
         String title = "报告号【"+projectReportData.getNumber()+"】审定单签章审批登记完成";
@@ -152,13 +153,9 @@ public class RuralProjectSignatureCallBackController extends BaseController {
             //修改签章对应信息文件
             projectReportDataService.updateSignatureInfo(projectReportData);
 
-
-
-
-            projectApprovalSignature.setStatus(5);
-            dao.updateApprovalSignature(projectApprovalSignature);
-
         }
+        projectApprovalSignature.setStatus(5);
+        dao.updateApprovalSignature(projectApprovalSignature);
         long t2 = System.currentTimeMillis();
         System.out.println("审定单回调运行耗时：" + (t2-t1) + " 毫秒");
         return null;
@@ -226,6 +223,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
             projectReportSignature.setStatus(1);
             dao.updateReportSignature(projectReportSignature);
+            return null;
 
         }
         //修改签章信息
@@ -278,10 +276,10 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
             workActivityProcessService.deleteProcessIdAuditUsers(projectReportSignature.getProcessInstanceId());
 
-            projectReportSignature.setStatus(5);
-            dao.updateReportSignature(projectReportSignature);
 
         }
+        projectReportSignature.setStatus(5);
+        dao.updateReportSignature(projectReportSignature);
 
 
 

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -60,7 +60,8 @@
 		a.signature_contract_id as "signatureContractId",
 		a.signature_file_name as "signatureFileName",
 		a.signature_upload_file_user as "signatureUploadFileUser.id",
-		a.signature_upload_date as "signatureUploadDate"
+		a.signature_upload_date as "signatureUploadDate",
+		a.first_audit_date as "firstAuditDate"
 	</sql>
 
 	<sql id="projectReportDataJoins">
@@ -570,6 +571,7 @@
 			technicist_date,
 			contract_category,
 			contract_rate,
+			first_audit_date,
 			ZiXunShouRu
 		) VALUES (
 			#{id},
@@ -687,6 +689,7 @@
 			#{technicistDate},
 			#{contractCategory},
 			#{contractRate},
+			#{firstAuditDate},
 			<choose>
 				<when test="ZiXunShouRu != null and ZiXunShouRu !=''">
 					#{ZiXunShouRu}
@@ -847,6 +850,9 @@
 		,technicist_remarks = #{technicistRemarks}
 		,contract_category = #{contractCategory}
 		,contract_rate = #{contractRate}
+		<if test="firstAuditDate != null and firstAuditDate != ''">
+			,first_audit_date = #{firstAuditDate}
+		</if>
 		<if test="ZiXunShouRu != null and ZiXunShouRu != ''">
 			,ZiXunShouRu = #{ZiXunShouRu}
 		</if>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -237,10 +237,10 @@
                     var nowDate = new Date();
                     var a = nowDate - baogaoDate;
                     var days = Math.floor(a / (24 * 3600 * 1000));
-                    if(days >37){
+                    /*if(days >37){
                         parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
                         return false;
-                    }
+                    }*/
                     var beginDateTime = $("#beginDate").val();
                     var endDateTime = $("#endDate").val();
                     if(beginDateTime != null && beginDateTime != undefined && beginDateTime != ''
@@ -337,8 +337,8 @@
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
                 type : 'date'
                 , trigger: 'click'
-                ,max: 0
-                ,min: -37 //37天之前
+                /*,max: 0
+                ,min: -37 //37天之前*/
             });
 
             /*laydate.render({

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -239,7 +239,7 @@
                     var nowDate = new Date();
                     var a = nowDate - baogaoDate;
                     var days = Math.floor(a / (24 * 3600 * 1000));
-                    if(days >37){
+                    if(days >40){
                         parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
                         return false;
                     }
@@ -340,7 +340,7 @@
                 type : 'date'
                 , trigger: 'click'
                 ,max: 0
-                ,min: -37 //37天之前
+                ,min: -40 //37天之前
             });
 
             laydate.render({

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

@@ -81,6 +81,14 @@
 		}
 
 		$(document).ready(function() {
+			var billingContent = $("#billingContent").val();
+			if(8 != billingContent){
+				$(".contractType").hide();
+				$("#contractTypeDoc").attr("class","form-control");
+			}else{
+				$(".contractType").show();
+				$("#contractTypeDoc").attr("class","form-control judgment");
+			}
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -102,6 +110,15 @@
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
 				});
+				form.on('select(billingContent)', function(data){
+					if(data.value == 8){
+						$(".contractType").show();
+						$("#contractTypeDoc").attr("class","form-control judgment");
+					}else{
+						$(".contractType").hide();
+						$("#contractTypeDoc").attr("class","form-control");
+					}
+				});
 				$("#attachment_btn").click(function () {
 					$("#attachment_file").click();
 				});
@@ -847,7 +864,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<form:select path="billingContent" class="form-control simple-select judgment">
+						<form:select path="billingContent" class="form-control simple-select judgment" lay-filter="billingContent">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -861,7 +878,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label double-line">开票内容要求：</label>
+					<label class="layui-form-label double-line"><span class="require-item contractType">*</span>开票内容要求：</label>
 					<div class="layui-input-block">
 						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>

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

@@ -81,6 +81,14 @@
 		}
 
 		$(document).ready(function() {
+			var billingContent = $("#billingContent").val();
+			if(8 != billingContent){
+				$(".contractType").hide();
+				$("#contractTypeDoc").attr("class","form-control");
+			}else{
+				$(".contractType").show();
+				$("#contractTypeDoc").attr("class","form-control judgment");
+			}
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -102,6 +110,16 @@
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
 				});
+
+				form.on('select(billingContent)', function(data){
+					if(data.value == 8){
+						$(".contractType").show();
+						$("#contractTypeDoc").attr("class","form-control judgment");
+					}else{
+						$(".contractType").hide();
+						$("#contractTypeDoc").attr("class","form-control");
+					}
+				});
 				$("#attachment_btn").click(function () {
 					$("#attachment_file").click();
 				});
@@ -816,7 +834,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<form:select path="billingContent" class="form-control simple-select judgment">
+						<form:select path="billingContent" class="form-control simple-select judgment" lay-filter="billingContent">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -830,7 +848,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label double-line">开票内容要求：</label>
+					<label class="layui-form-label double-line"><span class="require-item contractType">*</span>开票内容要求：</label>
 					<div class="layui-input-block">
 						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>

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

@@ -82,6 +82,14 @@
         }
 
         $(document).ready(function() {
+        	var billingContent = $("#billingContent").val();
+        	if(8 != billingContent){
+				$(".contractType").hide();
+				$("#contractTypeDoc").attr("class","form-control");
+			}else{
+				$(".contractType").show();
+				$("#contractTypeDoc").attr("class","form-control judgment");
+			}
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 				form.on("radio(invoiceType)", function(event){
@@ -103,6 +111,16 @@
 						$("#telephone").attr("class","form-control isTel layui-input");
 					}
 				});
+
+				form.on('select(billingContent)', function(data){
+					if(data.value == 8){
+						$(".contractType").show();
+						$("#contractTypeDoc").attr("class","form-control judgment");
+					}else{
+						$(".contractType").hide();
+						$("#contractTypeDoc").attr("class","form-control");
+					}
+				});
 			});
             /*$('#money').keyup(function(){
                 var c=$(this);
@@ -850,7 +868,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>开票内容：</label>
 					<div class="layui-input-block readOnlyFFF">
-						<form:select path="billingContent" class="form-control simple-select judgment">
+						<form:select path="billingContent" class="form-control simple-select judgment"  lay-filter="billingContent">
 							<form:options items="${fns:getMainDictList('billing_content')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
 					</div>
@@ -864,7 +882,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 with-textarea">
-					<label class="layui-form-label double-line">开票内容要求：</label>
+					<label class="layui-form-label double-line"><span class="require-item contractType">*</span>开票内容要求：</label>
 					<div class="layui-input-block">
 						<form:textarea path="content" id="contractTypeDoc" placeholder="请输入开票内容要求" htmlEscape="false" rows="4"    class="form-control"/>
 					</div>