报告签章信息修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageElectronicSealDao.java

@@ -98,4 +98,32 @@ public interface RuralProjectMessageElectronicSealDao extends CrudDao<ProjectRep
      * @return
      */
     void insertByList(List<ProjectReportSignatureInfo> list);
+
+    /**
+     * 根据项目id查询到的报告号查询project_report_signature_info表的信息
+     * @param projectId
+     * @return
+     */
+    ProjectReportSignatureInfo findProjectReportSignatureInfoByProjectId(String projectId);
+
+    /**
+    * 根据id查询咨询员
+    * @param consultantId
+    * @return
+    * */
+    String findZXYById(String consultantId);
+
+    /**
+     *  更新
+     * @param projectReportSignatureInfo
+     * @return
+     * */
+    void updateProjectReportSignatureInfo(ProjectReportSignatureInfo projectReportSignatureInfo);
+
+    /**
+     * 根据name查询咨询员id
+     * @param consultantName
+     * @return
+     * */
+    String findZXYByName(String consultantName);
 }

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

@@ -2089,6 +2089,34 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         return null;
     }
 
+    /*
+    * 根据projectid查询project_report_signature_info
+    * */
+    public ProjectReportSignatureInfo findProjectReportSignatureInfoByProjectId(String projectId){
+        ProjectReportSignatureInfo projectReportSignatureInfo = dao.findProjectReportSignatureInfoByProjectId(projectId);
+        return  projectReportSignatureInfo;
+    }
 
+    /*
+    * 根据id查到咨询员名称
+    * */
+    public String findZXYById(String id){
+        String name = dao.findZXYById(id);
+        return name;
+    }
 
+    /*
+    * 更新project_report_signature_info表
+    * */
+    public void updateProjectReportSignatureInfo(ProjectReportSignatureInfo projectReportSignatureInfo){
+        dao.updateProjectReportSignatureInfo(projectReportSignatureInfo);
+    }
+
+    /*
+     * 根据名称查到咨询员id
+     * */
+    public String findZXYByName(String Name){
+        String id = dao.findZXYByName(Name);
+        return id;
+    }
 }

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

@@ -2,11 +2,7 @@ package com.jeeplus.modules.ruralprojectrecords.web;
 
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.utils.FreemarkerUtil;
-import com.jeeplus.common.utils.ResponseUtil;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
-import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.common.utils.*;
 import com.jeeplus.common.utils.excel.ImportExcelNew;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
@@ -25,11 +21,9 @@ import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewSer
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.utils.SftpClientUtil;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import freemarker.template.Configuration;
@@ -38,19 +32,21 @@ import jersey.repackaged.com.google.common.collect.Lists;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -178,6 +174,30 @@ public class RuralProjectMessageElectronicSealController extends BaseController
         return "modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList";
     }
 
+
+    /**
+     * 查看，增加，编辑项目表单页面
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical= Logical.OR)
+    @RequestMapping(value = "form")
+    public String form(@RequestParam(value = "id") String id, Model model) {
+        //查询到显示信息
+        ProjectReportSignatureInfo projectReportSignatureInfo = ruralProjectMessageElectronicSealService.findProjectReportSignatureInfoByProjectId(id);
+        /*if(null == projectReportSignatureInfo){
+            projectReportSignatureInfo = new ProjectReportSignatureInfo();
+            model.addAttribute("consultantName","");
+        }else{*/
+            //根据id查咨询员名称
+            String consultantName = ruralProjectMessageElectronicSealService.findZXYById(projectReportSignatureInfo.getConsultant());
+            model.addAttribute("consultantName",consultantName);
+        /*}*/
+
+
+        model.addAttribute("projectReportSignatureInfo",projectReportSignatureInfo);
+        return "modules/ruralprojectrecords/electronicSeal/ruralProjectReportSignatureInfoForm";
+    }
+
+
     //@RequiresPermissions("ruralProject:electronicSeal:approvalForm")
     @RequestMapping(value="approvalForm")
     public String approvalForm(RuralProjectRecords projectRecords, Model model){
@@ -702,4 +722,26 @@ public class RuralProjectMessageElectronicSealController extends BaseController
     }
 
 
+    /**
+     * 报告签章信息保存
+     */
+//    @RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical= Logical.OR)
+    @Transactional(readOnly = false)
+    @RequestMapping(value = "save")
+    public String save(ProjectReportSignatureInfo projectReportSignatureInfo, RedirectAttributes redirectAttributes,
+                       @RequestParam(value = "consultantName") String consultantName) throws Exception {
+//        if (!beanValidator(model, projectRecords)){
+//            return form(projectRecords, model);
+//        }
+        if(null == projectReportSignatureInfo.getConsultant() || projectReportSignatureInfo.getConsultant().equals("")){
+            String consultant = ruralProjectMessageElectronicSealService.findZXYByName(consultantName);
+            projectReportSignatureInfo.setConsultant(consultant);
+        }
+        //修改
+        ruralProjectMessageElectronicSealService.updateProjectReportSignatureInfo(projectReportSignatureInfo);
+
+
+        addMessage(redirectAttributes, "报告签章信息修改成功");
+        return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
+    }
 }

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

@@ -390,4 +390,78 @@
 		where id = #{id}
 	</update>
 
+	<select id="findProjectReportSignatureInfoByProjectId" resultType="ProjectReportSignatureInfo">
+		select
+		<include refid="projectReportRecordColumns"/>
+		from project_report_signature_info a
+		<where>
+			a.project_report_id in
+			(select number from project_report_data where project_id=#{projectId})
+		</where>
+	</select>
+
+	<select id="findZXYById" resultType="String">
+		select name from sys_user where id=#{consultantId}
+	</select>
+
+	<update id="updateProjectReportSignatureInfo" parameterType="ProjectReportSignatureInfo">
+		update project_report_signature_info set
+			submit_fee=#{submitFee},
+			authorize_fee=#{authorizeFee},
+			construction_unit_assessment_fee=#{constructionUnitAssessmentFee},
+			authorize_fee_deduct_assessment_fee=#{authorizeFeeDeductAssessmentFee},
+			construction_unit=#{constructionUnit},
+			description_of_deduction=#{descriptionOfDeduction},
+			description_of_exceeding_the_contract_amount=#{descriptionOfExceedingTheContractAmount},
+			description_of_special_matters=#{descriptionOfSpecialMatters},
+			stamp_date=#{stampDate},
+			print_quantity=#{printQuantity},
+			report_preparation_date=#{reportPreparationDate},
+			agreed_start_date=#{agreedStartDate},
+			agreed_end_date=#{agreedEndDate},
+			consultant=#{consultant},
+			self_calibration_opinion=#{selfCalibrationOpinion},
+			review_opinion=#{reviewOpinion},
+			review_date=#{reviewDate},
+			date_of_consultation_report=#{dateOfConsultationReport},
+			start_date_of_consulting_operation=#{startDateOfConsultingOperation},
+			end_date_of_consultation=#{endDateOfConsultation},
+			start_audit_date=#{startAuditDate},
+			project_scale_content_scope=#{projectScaleContentScope},
+			main_contents_of_project=#{mainContentsOfProject},
+			total_contract_price=#{totalContractPrice},
+			contract_start_date=#{contractStartDate},
+			contract_end_date=#{contractEndDate},
+			actual_start_date=#{actualStartDate},
+			actual_end_date=#{actualEndDate},
+			completion_acceptance_date=#{completionAcceptanceDate},
+			design_unit=#{designUnit},
+			construction_control_unit=#{constructionControlUnit},
+			follow_up_audit_unit=#{followUpAuditUnit},
+			engineering_design_change_order=#{engineeringDesignChangeOrder},
+			confirmation_sheet_of_quantities=#{confirmationSheetOfQuantities},
+			project_visa=#{projectVisa},
+			quality_price_confirmation_of_engineering_materials=#{qualityPriceConfirmationOfEngineeringMaterials},
+			listmaterials_equipment_by_a=#{listmaterialsEquipmentByA},
+			project_reward_and_damages=#{projectRewardAndDamages},
+			charge=#{charge},
+			taxes=#{taxes},
+			duration_difference_causes_and_responsibilities=#{durationDifferenceCausesAndResponsibilities},
+			quality_difference_causes_and_responsibilities=#{qualityDifferenceCausesAndResponsibilities},
+			other_contents_and_expenses=#{otherContentsAndExpenses},
+			project_cost_consulting_contract=#{projectCostConsultingContract},
+			settlement_pricing_basis_document=#{settlementPricingBasisDocument},
+			materials_and_equipment_by_a=#{materialsAndEquipmentByA},
+			a_materials_by_b=#{aMaterialsByB},
+			reward_and_punishment_fees=#{rewardAndPunishmentFees},
+			water_and_electricity_fees_handle_situation=#{waterAndElectricityFeesHandleSituation},
+			construction_quality_warranty_deposit=#{constructionQualityWarrantyDeposit},
+			tax_difference_calculation_and_processing=#{taxDifferenceCalculationAndProcessing}
+			where project_report_id=#{projectReportId}
+	</update>
+
+	<select id="findZXYByName" resultType="String">
+		select id from sys_user where name=#{consultantName}
+	</select>
+
 </mapper>

src/main/webapp/WEB-INF/tags/sys/reportedtreeselectUserZXY.tag

@@ -26,7 +26,10 @@
 	<div class="input-group">
 		<input id="${id}Name" name="${labelName}" placeholder="请选择${title}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle} "/>
-
+			<span class="input-group-btn">
+	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
+	             </button>
+       		 </span>
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">

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

@@ -1175,6 +1175,7 @@
                 ,{field:'op',align:'center',title:"操作",width:320,templet:function(d) {
 						////对操作进行初始化
 						var xml = '<div class=\"layui-btn-group\">';
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/electronicSeal/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 
 						if(d.falg=="1"){
 							if(d.approvalSignatureStatus == 0){