报告签章

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -17,6 +17,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureRelation;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureWork;
+import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ReportSignature;
 import com.jeeplus.modules.signature.projectReportSignatureWork.service.ProjectReportSignatureWorkService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -146,15 +147,32 @@ public class ProjectReportSignatureWorkController extends BaseController {
     @RequiresPermissions(value={"projectReport:projectReportSignature:add","projectReport:projectReportSignature:edit"},logical= Logical.OR)
     @RequestMapping(value = "form")
     public String form(ProjectReportSignatureWork projectReportSignature, Model model) {
+        User user = UserUtils.getUser();
         if (projectReportSignature!=null&&StringUtils.isNotBlank(projectReportSignature.getId())) {
             projectReportSignature = projectReportSignatureService.get(projectReportSignature.getId());
         }else {
-            projectReportSignature.setCreateBy(UserUtils.getUser());
+            projectReportSignature.setCreateBy(user);
             projectReportSignature.setOffice(UserUtils.getSelectOffice());
             projectReportSignature.setCreateDate(new Date());
         }
+        //根据当前登录人获取签章负责人信息
+        List<User> userList = projectReportSignatureService.getDutyPersonList(user);
+        if (null != userList){
+            model.addAttribute("dutyPersonList",userList);
+        }
 
-
+        //根据签章id查询报告签章信息
+        ReportSignature reportSignature=projectReportSignatureService.getReportBySigId(projectReportSignature.getId());
+        if (null != reportSignature){
+            projectReportSignature.setDutyPerson(reportSignature.getDutyPerson());
+            projectReportSignature.setSignatureName(reportSignature.getSignatureName());
+        }
+        //根据签章id查询审定单签章信息
+        ReportSignature approvalSignature=projectReportSignatureService.getApprovalBySigId(projectReportSignature.getId());
+        if (null != approvalSignature){
+            projectReportSignature.setDutyPerson(approvalSignature.getDutyPerson());
+            projectReportSignature.setSignatureName(approvalSignature.getSignatureName());
+        }
         model.addAttribute("projectReportSignature", projectReportSignature);
         return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkForm";
     }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/dao/ProjectReportSignatureWorkDao.java

@@ -4,6 +4,8 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureRelation;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureWork;
+import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ReportSignature;
+import com.jeeplus.modules.sys.entity.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,4 +62,29 @@ public interface ProjectReportSignatureWorkDao extends CrudDao<ProjectReportSign
      * @return
      */
     List<ProjectReportSignatureRelation> getProjectRelation(String invoiceId);
+
+    /**
+     * 根据开票id查询所有开票项目 关联信息
+     * @param invoiceId
+     * @return
+     */
+    ProjectReportSignatureRelation getProject(String id);
+    //根据签章id查询报告签章信息
+    ReportSignature getReportBySigId(String id);
+    //根据签章id查询审定单签章信息
+    ReportSignature getApprovalBySigId(String id);
+
+    List<User> getDutyPersonList(String id);
+    //新增报告签章信息
+    void insertReportSignature(ProjectReportSignatureWork projectReportSignature);
+    //修改报告签章信息
+    void updateReportSignature(ProjectReportSignatureWork projectReportSignature);
+    //新增审定单签章信息
+    void insertApprovalSignature(ProjectReportSignatureWork projectReportSignature);
+    //修改审定单签章信息
+    void updateApprovalSignature(ProjectReportSignatureWork projectReportSignature);
+    //删除审定单信息
+    void deleteApprovalSignature(String id);
+    //删除报告签章信息
+    void deleteReportSignature(String id);
 }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/entity/ProjectReportSignatureWork.java

@@ -40,6 +40,10 @@ public class ProjectReportSignatureWork extends ActEntity<ProjectReportSignature
     private Integer signatureUrlFlag;		//签章完成值判定条件
     private Date signatureUploadDate;		//签章完成时间
     private User signatureUploadFileUser;		//签章文件上传人信息
+    private String dutyPerson; //签章责任人
+    private String signatureId; //签章id
+
+    private ProjectReportSignatureRelation reportSignatureRelation;
 
 
     private List<ProjectReportSignatureRelation> projectReportSignatureRelationList;//开票和项目关系表
@@ -50,6 +54,30 @@ public class ProjectReportSignatureWork extends ActEntity<ProjectReportSignature
 
     private String projectName;   //签章项目名称
 
+    public String getSignatureId() {
+        return signatureId;
+    }
+
+    public void setSignatureId(String signatureId) {
+        this.signatureId = signatureId;
+    }
+
+    public String getDutyPerson() {
+        return dutyPerson;
+    }
+
+    public void setDutyPerson(String dutyPerson) {
+        this.dutyPerson = dutyPerson;
+    }
+
+    public ProjectReportSignatureRelation getReportSignatureRelation() {
+        return reportSignatureRelation;
+    }
+
+    public void setReportSignatureRelation(ProjectReportSignatureRelation reportSignatureRelation) {
+        this.reportSignatureRelation = reportSignatureRelation;
+    }
+
     public String getUserId() {
         return userId;
     }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/entity/ReportSignature.java

@@ -0,0 +1,74 @@
+package com.jeeplus.modules.signature.projectReportSignatureWork.entity;
+
+import com.jeeplus.common.persistence.ActEntity;
+import com.jeeplus.modules.sys.entity.Office;
+
+/**
+ * 报告签章表,审定单签章
+ */
+public class ReportSignature extends ActEntity<ReportSignature> {
+
+    private Office office;		// 部门ID
+    private Office company;		// 公司ID
+    private Integer status;  //状态
+    private String processInstanceId;   //流程编号
+    private String dutyPerson; //签章责任人
+    private String signatureId; //签章id
+    private String SignatureName; //签章描述
+
+    public String getSignatureName() {
+        return SignatureName;
+    }
+
+    public void setSignatureName(String signatureName) {
+        SignatureName = signatureName;
+    }
+
+    public Office getOffice() {
+        return office;
+    }
+
+    public void setOffice(Office office) {
+        this.office = office;
+    }
+
+    public Office getCompany() {
+        return company;
+    }
+
+    public void setCompany(Office company) {
+        this.company = company;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+
+    public String getDutyPerson() {
+        return dutyPerson;
+    }
+
+    public void setDutyPerson(String dutyPerson) {
+        this.dutyPerson = dutyPerson;
+    }
+
+    public String getSignatureId() {
+        return signatureId;
+    }
+
+    public void setSignatureId(String signatureId) {
+        this.signatureId = signatureId;
+    }
+}

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -18,6 +18,7 @@ import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.signature.projectReportSignatureWork.dao.ProjectReportSignatureWorkDao;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureRelation;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureWork;
+import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ReportSignature;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
@@ -45,6 +46,7 @@ import org.activiti.engine.IdentityService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -115,22 +117,38 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             WorkattachmentService.clientAttachmentManageOnUrl(projectReportSignature.getWorkAttachments());
 
             //根据开票id查询关联项目
-            List<ProjectReportSignatureRelation> projectRelationList = dao.getProjectRelation(projectReportSignature.getId());
-            for (ProjectReportSignatureRelation projectRelation: projectRelationList) {
-                if(StringUtils.isBlank(projectRelation.getClientName())){
+            ProjectReportSignatureRelation reportSignatureRelation = dao.getProject(projectReportSignature.getId());
+            if (null != reportSignatureRelation){
+                if(StringUtils.isBlank(reportSignatureRelation.getClientName())){
                     //无合同查找委托方信息
-                    RuralProjectRecords records1 = ruralProjectRecordsService.get(projectRelation.getProjectId());
+                    RuralProjectRecords records1 = ruralProjectRecordsService.get(reportSignatureRelation.getProjectId());
                     //无合同状态下，获取委托方的名称
                     if (records1.getWorkContractInfo() == null || null == records1.getWorkContractInfo().getClient() || StringUtils.isBlank(records1.getWorkContractInfo().getClient().getName())){
                         ruralProjectRecordsService.queryLinkmanInfos(records1);
                         if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
                             WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-                            projectRelation.setClientName(linkman.getClientId().getName());
+                            reportSignatureRelation.setClientName(linkman.getClientId().getName());
                         }
                     }
                 }
             }
-            projectReportSignature.setProjectReportSignatureRelationList(projectRelationList);
+            projectReportSignature.setReportSignatureRelation(reportSignatureRelation);
+//            List<ProjectReportSignatureRelation> projectRelationList = dao.getProjectRelation(projectReportSignature.getId());
+//            for (ProjectReportSignatureRelation projectRelation: projectRelationList) {
+//                if(StringUtils.isBlank(projectRelation.getClientName())){
+//                    //无合同查找委托方信息
+//                    RuralProjectRecords records1 = ruralProjectRecordsService.get(projectRelation.getProjectId());
+//                    //无合同状态下，获取委托方的名称
+//                    if (records1.getWorkContractInfo() == null || null == records1.getWorkContractInfo().getClient() || StringUtils.isBlank(records1.getWorkContractInfo().getClient().getName())){
+//                        ruralProjectRecordsService.queryLinkmanInfos(records1);
+//                        if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+//                            WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+//                            projectRelation.setClientName(linkman.getClientId().getName());
+//                        }
+//                    }
+//                }
+//            }
+//            projectReportSignature.setProjectReportSignatureRelationList(projectRelationList);
 
         }
         return projectReportSignature;
@@ -191,31 +209,99 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         }
 
         //添加申请编号
-        synchronized (SYN_BYTE) {
-            if (StringUtils.isBlank(projectReportSignature.getNumber())) {
-                //工程造价鉴定 需要纸质归档
-                assert createBy != null;
-                projectReportSignature.setNumber(serialNumTplService.genSerialNum(createBy.getCompany(), ProjectReportSignatureWork.DAILY_OFFICE_WORK_KEY));
-
-            }
-        }
-
+//        synchronized (SYN_BYTE) {
+//            if (StringUtils.isBlank(projectReportSignature.getNumber())) {
+//                //工程造价鉴定 需要纸质归档
+//                assert createBy != null;
+//                projectReportSignature.setNumber(serialNumTplService.genSerialNum(createBy.getCompany(), ProjectReportSignatureWork.DAILY_OFFICE_WORK_KEY));
+//
+//            }
+//        }
+        String id = UUID.randomUUID().toString().replace("-","");
         if(StringUtils.isBlank(projectReportSignature.getId())){
             projectReportSignature.setCompany(UserUtils.getUser().getCompany());
             projectReportSignature.setOffice(UserUtils.getUser().getOffice());
 
             projectReportSignature.preInsert();
+            projectReportSignature.setId(id);
             dao.insert(projectReportSignature);
+            if (projectReportSignature.getSignatureType().equals("1")){
+                projectReportSignature.setSignatureId(id);
+                dao.insertReportSignature(projectReportSignature);
+            }else {
+                projectReportSignature.setSignatureId(id);
+                dao.insertApprovalSignature(projectReportSignature);
+            }
         }else {
             projectReportSignature.preUpdate();
             dao.update(projectReportSignature);
+            //根据签章类型进行保存
+            if (projectReportSignature.getSignatureType().equals("1")){//报告签章
+
+                ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
+                ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
+                ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
+                //判断签章类型是否发生改变
+                if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
+                    //修改报告签章信息
+                    if (null != reportSignature){
+                        projectReportSignature.setId(reportSignature.getId());
+                        projectReportSignature.setSignatureId(projectReportSignature.getId());
+                        projectReportSignature.preUpdate();
+                        dao.updateReportSignature(projectReportSignature);
+                    }else {
+                        projectReportSignature.setCompany(UserUtils.getUser().getCompany());
+                        projectReportSignature.setOffice(UserUtils.getUser().getOffice());
+                        projectReportSignature.setSignatureId(signatureWork.getId());
+                        projectReportSignature.preInsert();
+                        dao.insertReportSignature(projectReportSignature);
+                    }
+                    //查询审定单签章表中是否存在数据,存在则进行删除
+                    if (null != approvalSignature){
+                        dao.deleteApprovalSignature(approvalSignature.getId());
+                    }
+                }
+
+            }else {//审定单签章
+                ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
+                //判断签章类型是否发生改变
+                if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
+                    ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
+                    if (null != approvalSignature){
+                        projectReportSignature.setId(approvalSignature.getId());
+                        projectReportSignature.setSignatureId(projectReportSignature.getId());
+                        projectReportSignature.preUpdate();
+                        dao.updateApprovalSignature(projectReportSignature);
+                    }else {
+                        projectReportSignature.setCompany(UserUtils.getUser().getCompany());
+                        projectReportSignature.setOffice(UserUtils.getUser().getOffice());
+                        projectReportSignature.setSignatureId(signatureWork.getId());
+                        projectReportSignature.preInsert();
+                        dao.insertApprovalSignature(projectReportSignature);
+                    }
+                    //查询报告签章表中是否存在数据,存在则进行删除
+                    ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
+                    if (null != reportSignature){
+                        dao.deleteReportSignature(reportSignature.getId());
+                    }
+                }
+            }
+        }
+
+        //保存附件时将id赋值为对应签章类型的id
+        if (projectReportSignature.getSignatureType().equals("1")){
+            ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
+            projectReportSignature.setId(reportSignature.getId());
+        }else {
+            ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
+            projectReportSignature.setId(approvalSignature.getId());
         }
 
         //保存签章附件信息
         this.saveAttachments(projectReportSignature);
 
         //处理需要签章的报告信息
-        this.disposeProjectReportRelevance(projectReportSignature);
+        //this.disposeProjectReportRelevance(projectReportSignature);
     }
 
     /**
@@ -286,7 +372,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         this.saveAttachments(projectReportSignature);
 
         //处理需要签章的报告信息
-        this.disposeProjectReportRelevance(projectReportSignature);
+        //this.disposeProjectReportRelevance(projectReportSignature);
 
         //启动审批流程
         this.startAudit(projectReportSignature,projectReportSignature.getProcessInstanceId());
@@ -1184,4 +1270,30 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         return projectRelationList;
     }
 
+    /**
+     * 根据签章id查询报告签章信息
+     * @param id 签章id
+     * @return
+     */
+    public ReportSignature getReportBySigId(String id) {
+        return dao.getReportBySigId(id);
+    }
+
+    /**
+     * 根据签章id查询审定单签章信息
+     * @param id 签章id
+     * @return
+     */
+    public ReportSignature getApprovalBySigId(String id) {
+        return dao.getApprovalBySigId(id);
+    }
+
+    /**
+     * 获取签章负责人信息
+     * @param user
+     * @return
+     */
+    public List<User> getDutyPersonList(User user) {
+        return dao.getDutyPersonList(user.getId());
+    }
 }

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -1531,6 +1531,7 @@
 			LEFT JOIN work_project_user w on a.id = w.project_id
 			LEFT JOIN sys_user su on w.user_id = su.id
 		</if>
+		LEFT JOIN sys_user su1 on a.create_by = su1.id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		<if test="workContractInfo !=null">
 			LEFT JOIN work_contract_info wci on a.contract_id = wci.id
@@ -1597,6 +1598,12 @@
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+			<if test="createBy != null and((createBy.id != null and createBy.id != '') or (createBy.name != null and createBy.name != ''))">
+				AND (a.create_by = #{createBy.id} or su1.name like concat('%',#{createBy.name},'%'))
+			</if>
+			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
+			</if>
 			<if test="reportData != null and reportData != ''">
 				<if test="reportData.number != null and reportData.number != ''">
 					AND prd.number like concat(concat('%',#{reportData.number}),'%')
@@ -1612,7 +1619,8 @@
 					</otherwise>
 				</choose>
 			</if>
-			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL} and a.submit_money = '1'
 			/*and prd.number is not null*/
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
@@ -1702,6 +1710,12 @@
 			<if test="endDate !=null">
 				AND a.create_date &lt; #{endDate}
 			</if>
+			<if test="createBy != null and((createBy.id != null and createBy.id != '') or (createBy.name != null and createBy.name != ''))">
+				AND (a.create_by = #{createBy.id} or dsu.name like concat('%',#{createBy.name},'%'))
+			</if>
+			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
+			</if>
 			<if test="reportData != null and reportData != ''">
 				<if test="reportData.number != null and reportData.number != ''">
 					AND prd.number like concat(concat('%',#{reportData.number}),'%')
@@ -1717,7 +1731,7 @@
 					</otherwise>
 				</choose>
 			</if>
-			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL} and a.submit_money = '1'
 			/*and prd.number is not null*/
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )

src/main/resources/mappings/modules/signature/projectReport/ProjectReportSignatureDao.xml

@@ -30,6 +30,30 @@
 		a.signature_flag as "signatureFlag"
 	</sql>
 
+	<sql id="signatureColumns">
+		distinct a.id AS "id",
+		a.create_by AS "createBy.id",
+		su.name as "createBy.name",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.remarks as "remarks",
+		a.signature_name as "signatureName",
+		a.office_id as "office.id",
+		o.name as "office.name",
+		a.company_id as "company.id",
+		a.status as "status",
+		a.process_instance_id as "processInstanceId",
+		a.duty_person as "dutyPerson",
+		a.signature_id as "signatureId"
+	</sql>
+
+	<sql id="signatureJoin">
+        LEFT JOIN sys_user su ON su.id = a.create_by
+		LEFT JOIN sys_office o ON o.id = a.office_id
+	</sql>
+
 	<sql id="dailyOfficeWorkLeftColumns">
         LEFT JOIN sys_user su ON su.id = a.create_by
         LEFT JOIN sys_user sus ON sus.id = a.signature_upload_file_user
@@ -169,10 +193,8 @@
 			update_by,
 			update_date,
 			del_flag,
-			remarks,
-			signature_name,
-			number,
 			signature_type,
+			project_id,
 			office_id,
 			company_id,
 			status,
@@ -216,10 +238,8 @@
 			#{updateBy.id},
 			#{updateDate},
 			#{delFlag},
-			#{remarks},
-			#{signatureName},
-			#{number},
 			#{signatureType},
+			#{reportSignatureRelation.projectId},
 			#{office.id},
 			#{company.id},
 			#{status},
@@ -264,21 +284,9 @@
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks}
-			<if test="number != null and number != ''">
-				,number = #{number}
-			</if>
-			<if test="signatureName != null and signatureName != ''">
-				,signature_name = #{signatureName}
-			</if>
 			<if test="signatureType != null and signatureType != ''">
 				,signature_type = #{signatureType}
 			</if>
-			<if test="status != null and status != ''">
-				,status = #{status}
-			</if>
-			<if test="processInstanceId != null and processInstanceId != ''">
-				,process_instance_id = #{processInstanceId}
-			</if>
 			<if test="signatureDocumentId != null and signatureDocumentId != ''">
 				,signature_document_id = #{signatureDocumentId}
 			</if>
@@ -386,4 +394,173 @@
 		order by rpr.create_by asc
 	</select>
 
+	<select id="getProject" resultType="com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureRelation">
+		select
+		  a.signature_project_report_id as 'signatureId',
+		  a.project_id as 'projectId',
+		  rpr.project_name as 'projectName',
+		  rpr.project_id as 'projectNum',
+		  wci.name as 'workContractName',
+		  prd.number as 'reportDataNum',
+		  wct.name as 'clientName'
+		from signature_project_report_relevance_number a
+		left join rural_project_records rpr on a.project_id = rpr.id
+		left join work_contract_info wci on rpr.contract_id = wci.id
+		left join work_client_info wct on wci.client_id = wct.id
+		left join project_report_data prd on prd.project_id = a.project_id
+		where a.signature_project_report_id = #{signatureId}
+	</select>
+
+	<select id="getReportBySigId" resultType="com.jeeplus.modules.signature.projectReportSignatureWork.entity.ReportSignature">
+		select
+		<include refid="signatureColumns"/>
+		from report_signature_report a
+		<include refid="signatureJoin"/>
+		where a.signature_id = #{id} and a.del_flag = '0'
+	</select>
+
+	<select id="getApprovalBySigId" resultType="com.jeeplus.modules.signature.projectReportSignatureWork.entity.ReportSignature">
+		select
+			<include refid="signatureColumns"/>
+		from report_signature_approval a
+		<include refid="signatureJoin"/>
+		where a.signature_id = #{id} and a.del_flag = '0'
+	</select>
+
+	<select id="getDutyPersonList" resultType="com.jeeplus.modules.sys.entity.User">
+		select
+			su.id,
+			su.name
+		from sys_area_staff_user_info a
+		left join sys_area_staff  sas on sas.id = a.area_staff_id and sas.del_flag = '0'
+		left join sys_user su on su.id = sas.area_leader_id  and su.del_flag = '0'
+		where a.user_id = #{id} and a.del_flag = '0'
+	</select>
+	
+	<insert id="insertReportSignature">
+		INSERT INTO report_signature_report(
+			id,
+			signature_id,
+			remarks,
+			signature_name,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			duty_person,
+			status,
+			process_instance_id,
+			office_id,
+			company_id
+		) VALUES (
+			#{id},
+			#{signatureId},
+			#{remarks},
+			#{signatureName},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{dutyPerson},
+			#{status},
+			#{processInstanceId},
+			#{office.id},
+			#{company.id}
+		)
+	</insert>
+
+	<update id="updateReportSignature">
+		UPDATE report_signature_report SET
+		update_date = now()
+		<if test="null != processInstanceId and '' != processInstanceId">
+			,process_instance_id = #{processInstanceId}
+		</if>
+		<if test="null != status and '' != status">
+			,status = #{status}
+		</if>
+		<if test="null != signatureId and '' != signatureId">
+			,signature_id = #{signatureId}
+		</if>
+		<if test="null != remarks and '' != remarks">
+			,remarks = #{remarks}
+		</if>
+		<if test="null != signatureName and '' != signatureName">
+			,signature_name = #{signatureName}
+		</if>
+		<if test="null != dutyPerson and '' != dutyPerson">
+			,duty_person = #{dutyPerson}
+		</if>
+		,update_date = now()
+		WHERE id = #{id}
+	</update>
+
+	<insert id="insertApprovalSignature">
+		INSERT INTO report_signature_approval(
+			id,
+			signature_id,
+			remarks,
+			signature_name,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			duty_person,
+			status,
+			process_instance_id,
+			office_id,
+			company_id
+		) VALUES (
+			#{id},
+			#{signatureId},
+			#{remarks},
+			#{signatureName},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{dutyPerson},
+			#{status},
+			#{processInstanceId},
+			#{office.id},
+			#{company.id}
+		)
+	</insert>
+
+	<update id="updateApprovalSignature">
+		UPDATE report_signature_approval SET
+		update_date = now()
+		<if test="null != processInstanceId and '' != processInstanceId">
+			,process_instance_id = #{processInstanceId}
+		</if>
+		<if test="null != status and '' != status">
+			,status = #{status}
+		</if>
+		<if test="null != signatureId and '' != signatureId">
+			,signature_id = #{signatureId}
+		</if>
+		<if test="null != remarks and '' != remarks">
+			,remarks = #{remarks}
+		</if>
+		<if test="null != signatureName and '' != signatureName">
+			,signature_name = #{signatureName}
+		</if>
+		<if test="null != dutyPerson and '' != dutyPerson">
+			,duty_person = #{dutyPerson}
+		</if>
+		,update_date = now()
+		WHERE id = #{id}
+	</update>
+
+	<delete id="deleteApprovalSignature">
+		delete from report_signature_approval where id = #{id}
+	</delete>
+
+	<delete id="deleteReportSignature">
+		delete from report_signature_report where id = #{id}
+	</delete>
+
 </mapper>

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

@@ -0,0 +1,62 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称（ID）"%>
+<%@ attribute name="type" type="java.lang.String" required="true" description="合同类型（ID）"%>
+<%@ attribute name="isTotal" type="java.lang.String" required="true" description="是否是总合同（ID）"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值（ID）"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称（Name）"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值（Name）"%>
+<%@ attribute name="fieldLabels" type="java.lang.String" required="true" description="表格Th里显示的名字"%>
+<%@ attribute name="fieldKeys" type="java.lang.String" required="true" description="表格Td里显示的值"%>
+<%@ attribute name="searchLabel" type="java.lang.String" required="true" description="表格Td里显示的值"%>
+<%@ attribute name="searchKey" type="java.lang.String" required="true" description="表格Td里显示的值"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="数据地址"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
+<script type="text/javascript">
+function searchGrid${id}(){
+    var url = "${url}?fieldLabels=${fieldLabels}&fieldKeys=${fieldKeys}&url=${url}&searchLabel=${searchLabel}&searchKey=${searchKey}&type=${type}&isTotal=${isTotal}";
+    url = encodeURI(url);
+	top.layer.open({
+	    type: 2,
+	    area: ['90%','90%'],
+	    title:"${title}",
+	    name:'friend',
+        skin:"two-btns",
+	    content: url,
+	    btn: ['确定', '关闭'],
+	    yes: function(index, layero){
+	    	 var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+	    	 var item = iframeWin.getSelectedItem();
+
+	    	 if(item == "-1"){
+		    	 return;
+	    	 }
+			var idArray= new Array(); //定义一数组
+			idArray=item.split('_item_')[0].split(","); //字符分割
+			$("#${id}Id").val(idArray[0]);
+			$("#${id}Name").val(item.split('_item_')[1]);
+			top.layer.close(index);//关闭对话框。
+			console.log(item.split('_item_')[0]);
+			setProjectValue(item.split('_item_')[0]);
+		},
+		  cancel: function(index){
+	       }
+	});
+};
+</script>
+
+	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
+	<div class="input-group" style="width: 100%">
+		<input id="${id}Name" name="${labelName }" ${allowInput?'':'readonly="readonly"'} onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass}" style="${cssStyle}"/>
+       		 <span class="input-group-btn">
+	       		 <button type="button" onclick="searchGrid${id}()" 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>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkForm.jsp

@@ -5,6 +5,7 @@
     <title>项目管理</title>
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
     <script src="${ctxStatic}/common/html/js/script.js"></script>
@@ -310,6 +311,36 @@
 
         }
 
+        function setProjectValue(obj){
+            console.log('obj',obj)
+            $.ajax({
+                async:false,
+                type:'post',
+                url:'${ctx}/projectReport/projectReportSignature/getPNumber',
+                data:{
+                    "obj":obj
+                },
+                success:function(data){
+                        var d = JSON.parse(data);
+                        $("#projectId").val(d.id);
+                        $("#projectName").val(d.projectName);
+                        $("#workContractName").val(d.workContractName);
+                        $("#projectNum").val(d.projectNum);
+                        $("#clientName").val(d.clientName);
+                        $("#reportDataNum").val(d.reportDataNum);
+                        var areaId = $("#areaId").val();
+                        if(undefined ==areaId || null == areaId || '' == areaId){
+                            $("#areaId").val(d.areaId);
+                            $("#areaName").val(d.areaName);
+                        }
+
+                }
+            })
+            }
+
+
+
+
     </script>
 </head>
 <body>
@@ -322,89 +353,123 @@
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>签章项目信息</h2></div>
-                <div class="layui-item nav-btns">
-                    <a class="nav-btn nav-btn-add" onclick="addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl);projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                </div>
-                <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
-                    <table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
-                        <thead>
-                        <tr>
-                            <th width="200px"><font color="red">*</font>项目名称</th>
-                            <th width="200px">报告号</th>
-                            <th width="200px">合同名称</th>
-                            <th width="200px">项目编号</th>
-                            <th width="200px">委托方</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="projectReportSignatureRelationList">
-                        </tbody>
-                    </table>
-                    <script type="text/template" id="projectReportSignatureRelationListTpl">//<!--
-                    <tr id="projectReportSignatureRelationList{{idx}}">
-                        <td class="hide">
-                            <input id="projectReportSignatureRelationList{{idx}}_signatureId" name="projectReportSignatureRelationList[{{idx}}].signatureId" type="hidden" value="{{row.signatureId}}"/>
-							<input id="projectReportSignatureRelationList{{idx}}_delFlag" name="projectReportSignatureRelationList[{{idx}}].delFlag" type="hidden" value="0"/>
-							<input id="projectReportSignatureRelationList{{idx}}_contractId" name="projectReportSignatureRelationList[{{idx}}].contractId" type="hidden" value="{{row.contractId}}"/>
-                        </td>
-                        <td>
-                            <sys:gridselectprojectsignatures url="${ctx}/projectReport/projectReportSignature/getProjectReportList" id="projectReportSignatureRelationList{{idx}}_projectId" name="projectReportSignatureRelationList[{{idx}}].projectId"  value="{{row.projectId}}"  title="选择所属项目" labelName="projectReportSignatureRelationList[{{idx}}].projectName" cssStyle="background-color: #fff"
-													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"  isProject="{{row.isProject}}" isProjectFalg="{{row.isProjectFalg}}" details="{{row.details}}"></sys:gridselectprojectsignatures>
-                        </td>
-                        <td>
-							<input id="projectReportSignatureRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>
-                        </td>
-                        <td>
-							<input id="projectReportSignatureRelationList{{idx}}_workContractName"  type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>
-                        </td>
-                        <td style="text-align:center;">
-							<input id="projectReportSignatureRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>
-                        </td>
-                        <td>
-							<input id="projectReportSignatureRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>
-                        </td>
-                        <td class="text-center op-td" >
-                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow1(this, '#projectReportSignatureRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
-                        </td>
-                    </tr>//-->
-                    </script>
-                    <script type="text/javascript">
-                        var projectReportSignatureRelationListRowIdx = 0, projectReportSignatureRelationListTpl = $("#projectReportSignatureRelationListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                        /*if($("#id").val()){
-                            projectReportSignatureRelationListRowIdx = ${fn:length(projectReportSignature.projectReportSignatureRelationList)};
-						}*/
-                        $(document).ready(function() {
-                            var data = ${fns:toJson(projectReportSignature.projectReportSignatureRelationList)};
-                            console.log(data)
-                            for (var i=0; i<data.length; i++){
-                                addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl, data[i])
-                                projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;
-                            }
-                        });
-                    </script>
+                <div id="divv">
+                    <div class="layui-item layui-col-sm6 lw7" id="d1">
+                        <label class="layui-form-label"><span class="require-item">*</span>选择项目：</label>
+                        <div class="layui-input-block  with-icon">
+                            <sys:gridselectSignatureProject url="${ctx}/projectReport/projectReportSignature/getProjectReportList" type="" isTotal="" id="projectId" name="reportSignatureRelation.projectId"  value="${projectReportSignature.reportSignatureRelation.projectId}"  title="选择所属项目" labelName="reportSignatureRelation.projectName"
+                                                    cssStyle="background-color: #fff" labelValue="${projectReportSignature.reportSignatureRelation.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectSignatureProject>
+
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">报告号：</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="reportDataNum"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.reportDataNum}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">合同名称：</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="workContractName"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.workContractName}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">项目编号：</label>
+                        <div class="layui-input-block">
+                            <input  htmlEscape="false"  readonly="true" id="projectNum"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectNum}"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">委托方：</label>
+                        <div class="layui-input-block">
+                            <input htmlEscape="false"  readonly="true" id="clientName" name="reportSignatureRelation.clientName" class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.clientName}"/>
+                        </div>
+                    </div>
                 </div>
+<%--                <div class="layui-item nav-btns">--%>
+<%--                    <a class="nav-btn nav-btn-add" onclick="addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl);projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>--%>
+<%--                </div>--%>
+<%--                <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">--%>
+<%--                    <table id="contentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">--%>
+<%--                        <thead>--%>
+<%--                        <tr>--%>
+<%--                            <th width="200px"><font color="red">*</font>项目名称</th>--%>
+<%--                            <th width="200px">报告号</th>--%>
+<%--                            <th width="200px">合同名称</th>--%>
+<%--                            <th width="200px">项目编号</th>--%>
+<%--                            <th width="200px">委托方</th>--%>
+<%--                            <th width="100px">操作</th>--%>
+<%--                        </tr>--%>
+<%--                        </thead>--%>
+<%--                        <tbody id="projectReportSignatureRelationList">--%>
+<%--                        </tbody>--%>
+<%--                    </table>--%>
+<%--                    <script type="text/template" id="projectReportSignatureRelationListTpl">//<!----%>
+<%--                    <tr id="projectReportSignatureRelationList{{idx}}">--%>
+<%--                        <td class="hide">--%>
+<%--                            <input id="projectReportSignatureRelationList{{idx}}_signatureId" name="projectReportSignatureRelationList[{{idx}}].signatureId" type="hidden" value="{{row.signatureId}}"/>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_delFlag" name="projectReportSignatureRelationList[{{idx}}].delFlag" type="hidden" value="0"/>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_contractId" name="projectReportSignatureRelationList[{{idx}}].contractId" type="hidden" value="{{row.contractId}}"/>--%>
+<%--                        </td>--%>
+<%--                        <td>--%>
+<%--                            <sys:gridselectprojectsignatures url="${ctx}/projectReport/projectReportSignature/getProjectReportList" id="projectReportSignatureRelationList{{idx}}_projectId" name="projectReportSignatureRelationList[{{idx}}].projectId"  value="{{row.projectId}}"  title="选择所属项目" labelName="projectReportSignatureRelationList[{{idx}}].projectName" cssStyle="background-color: #fff"--%>
+<%--													labelValue="{{row.projectName}}" cssClass="form-control judgment layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"  isProject="{{row.isProject}}" isProjectFalg="{{row.isProjectFalg}}" details="{{row.details}}"></sys:gridselectprojectsignatures>--%>
+<%--&lt;%&ndash;                        </td>&ndash;%&gt;--%>
+<%--                        <td>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_reportDataNum"  type="text" value="{{row.reportDataNum}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_workContractName"  type="text" value="{{row.workContractName}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td style="text-align:center;">--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_projectNum"  type="text" value="{{row.projectNum}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td>--%>
+<%--							<input id="projectReportSignatureRelationList{{idx}}_clientName"  type="text" value="{{row.clientName}}" readonly="readonly"  class="form-control"/>--%>
+<%--                        </td>--%>
+<%--                        <td class="text-center op-td" >--%>
+<%--                            {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow1(this, '#projectReportSignatureRelationList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
+<%--                        </td>--%>
+<%--                    </tr>//-->--%>
+<%--                    </script>--%>
+<%--                    <script type="text/javascript">--%>
+<%--                        var projectReportSignatureRelationListRowIdx = 0, projectReportSignatureRelationListTpl = $("#projectReportSignatureRelationListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");--%>
+<%--                        /*if($("#id").val()){--%>
+<%--                            projectReportSignatureRelationListRowIdx = ${fn:length(projectReportSignature.projectReportSignatureRelationList)};--%>
+<%--						}*/--%>
+<%--                        $(document).ready(function() {--%>
+<%--                            var data = ${fns:toJson(projectReportSignature.projectReportSignatureRelationList)};--%>
+<%--                            console.log(data)--%>
+<%--                            for (var i=0; i<data.length; i++){--%>
+<%--                                addRow1('#projectReportSignatureRelationList', projectReportSignatureRelationListRowIdx, projectReportSignatureRelationListTpl, data[i])--%>
+<%--                                projectReportSignatureRelationListRowIdx = projectReportSignatureRelationListRowIdx + 1;--%>
+<%--                            }--%>
+<%--                        });--%>
+<%--                    </script>--%>
+<%--                </div>--%>
 
             </div>
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>签章基础信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>签章描述：</label>
+                    <label class="layui-form-label">签章描述：</label>
                     <div class="layui-input-block">
-                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">签章编号：</label>
-                    <div class="layui-input-block">
-                        <div class="input-group">
-                            <form:input path="number" htmlEscape="false" readonly="true" class="form-control layui-input"/>
-                            <%--<span class="input-group-btn">
-                                <label class="form-status"><c:choose><c:when test="${not empty projectReportSignature.status}">${fns:getDictLabel(projectReportSignature.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
-                             </span>--%>
-                        </div>
+                        <form:input path="signatureName" id="signatureName" maxlength="255" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input"/>
                     </div>
                 </div>
+<%--                <div class="layui-item layui-col-sm6 lw7">--%>
+<%--                    <label class="layui-form-label">签章编号：</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <div class="input-group">--%>
+<%--                            <form:input path="number" htmlEscape="false" readonly="true" class="form-control layui-input"/>--%>
+<%--                            &lt;%&ndash;<span class="input-group-btn">--%>
+<%--                                <label class="form-status"><c:choose><c:when test="${not empty projectReportSignature.status}">${fns:getDictLabel(projectReportSignature.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>--%>
+<%--                             </span>&ndash;%&gt;--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
 
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
@@ -415,7 +480,17 @@
                         </form:select>
                     </div>
                 </div>
-
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>签章责任人：</label>
+                    <div class="layui-input-block readOnlyFFF">
+                        <select class="form-control judgment layui-input" id="dutyPerson" name="dutyPerson">
+                            <option value=""/>
+                            <c:forEach items="${dutyPersonList}" var="user">
+                                <option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
 
 
 
@@ -448,7 +523,7 @@
             </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>签章附件信息</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>签章附件信息<span style="color: red">(仅可上传doc、docx、pdf类型文档)</span></h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                 </div>
@@ -644,5 +719,21 @@
         </form:form>
     </div>
 </div>
+<script>
+    $(document).ready(function() {
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            layui.form.on('select(dutyPersonFilter)', function(data){
+                console.log(data.value); //得到被选中的值
+                var duty = data.value
+
+               var res= $("#dutyPerson").val()
+                console.log(res);
+            });
+        });
+
+    });
+
+</script>
 </body>
 </html>

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

@@ -24,14 +24,14 @@
 			    	});
 
 			//搜索框收放
-			$('#moresee').click(function(){
-				if($('#moresees').is(':visible'))
+			$('#moresee1').click(function(){
+				if($('#moresees1').is(':visible'))
 				{
-					$('#moresees').slideUp(0,resizeListWindow1);
-					$('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+					$('#moresees1').slideUp(0,resizeListWindow1);
+					$('#moresee1 i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
 				}else{
-					$('#moresees').slideDown(0,resizeListWindow1);
-					$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+					$('#moresees1').slideDown(0,resizeListWindow1);
+					$('#moresee1 i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 				}
 			});
 
@@ -52,10 +52,10 @@
 				top.layer.alert('请至少选择一条数据!', {icon: 0, title:'警告'});
 				return "-1";
 			}
-			/*if(size > 1 ){
+			if(size > 1 ){
 				top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
 				return "-1";
-			}*/
+			}
 			$("#projectFlag").val(1);
 
 			var id =  $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
@@ -113,13 +113,28 @@
 							</div>
 							<div class="layui-item athird fr">
 								<div class="input-group">
-									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+									<a href="#" id="moresee1"><i class="glyphicon glyphicon-menu-down"></i></a>
 									<div class="layui-btn-group search-spacing">
 										<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
 										<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 									</div>
 								</div>
 							</div>
+							<div id="moresees1" style="clear:both;display:none;" class="lw6">
+								<div class="layui-item query athird ">
+									<label class="layui-form-label">登记人：</label>
+									<div class="layui-input-block with-icon">
+										<sys:inquireselectUserNotReadolny id="createBy" name="createBy.id" value="${obj.createBy.id}" labelName="createBy.name" labelValue="${obj.createBy.name}" cssStyle="background-color: #fff"
+																		  title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+									</div>
+								</div>
+								<div class="layui-item query athird ">
+									<label class="layui-form-label">委托方：</label>
+									<div class="layui-input-block">
+										<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+									</div>
+								</div>
+							</div>
 							<div style="    clear:both;"></div>
 						</div>
 					</div>
@@ -196,10 +211,10 @@
 										top.layer.alert('请至少选择一条数据!', {icon: 0, title:'警告'});
 										return "-1";
 									}
-									/*if(size > 1 ){
+									if(size > 1 ){
                                         top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
                                         return "-1";
-                                    }*/
+                                    }
 									$("#projectFlag").val(1);
 
 								var id =  $("#contentTable tbody tr td input.i-checks:checkbox:checked").attr("id");
@@ -265,6 +280,21 @@
 														</div>
 													</div>
 												</div>
+												<div id="moresees" style="clear:both;display:none;" class="lw6">
+													<div class="layui-item query athird ">
+														<label class="layui-form-label">登记人：</label>
+														<div class="layui-input-block with-icon">
+															<sys:inquireselectUserNotReadolny id="createBy" name="createBy.id" value="${obj.createBy.id}" labelName="createBy.name" labelValue="${obj.createBy.name}" cssStyle="background-color: #fff"
+																							  title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+														</div>
+													</div>
+													<div class="layui-item query athird ">
+														<label class="layui-form-label">委托方：</label>
+														<div class="layui-input-block">
+															<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+														</div>
+													</div>
+												</div>
 												<div style="    clear:both;"></div>
 											</div>
 										</div>