归档批次管理0.2.6/项目列表线下归档状态

src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingBatchDao.java

@@ -14,4 +14,5 @@ public interface ProjectFilingBatchDao extends CrudDao<ProjectFilingBatch> {
     List<ProjectFilingBatch> findProjectIdByFiling(@Param("id") String id);
 
     void updateProcessIdAndStatus(ProjectFilingBatch projectFilingBatch);
+    ProjectFilingBatch findByFilingBatch(@Param("filingBatch") String filingBatch);
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/dao/ProjectFilingbatchRelationDao.java

@@ -11,4 +11,5 @@ import java.util.List;
 public interface ProjectFilingbatchRelationDao extends CrudDao<ProjectFilingbatchRelation> {
     Integer deleteByprojectId(ProjectFilingbatchRelation relation);
     List<ProjectFilingbatchRelation> getProjectRelation(@Param("filingBatch")String filingBatch);
+    ProjectFilingbatchRelation getProjectId(@Param("projectId")String projectId);
 }

src/main/java/com/jeeplus/modules/projectFilingBatch/entity/ProjectFilingBatch.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     public static final String SERIAL_BIZCODE ="1";
-    public static final String SERIAL_COST_BIZCODE ="1004";
+    public static final String ARCHIVE_BATCH_TEMPLATE ="102";//归档批次号模板key
     private static final long serialVersionUID = 1L;
     @NotNull(message = "归档编号不能为空")
     private String filingBatch ;//档次批号
@@ -25,15 +25,14 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
     private Integer filingStatus;//归档审批状态
     private String projectId; //项目id
     private Integer status=null;//归档状态
-    private Integer boxNum=null; //盒号
-    private Integer reBoxNum=null;//确认盒号
+    private Integer boxNum=null; //案卷号
+    private Integer reBoxNum=null;//确认案卷号
     private String number;//报告号
     private List<RuralProjectRecords> project= Lists.newArrayList();;
     private Office office;
     private String home;
     private Act act;//工作流对象
-    private String bzshbUserId; //总审用户id
-    private List<User> bzshbUserList;  //总审用户信息
+    private String information; //归档批次信息
     private List<ProjectFilingbatchRelation> projectFilingbatchRelations;
 
     public String getProcessinstanceId() {
@@ -132,20 +131,12 @@ public class ProjectFilingBatch extends DataEntity<ProjectFilingBatch> {
         this.act = act;
     }
 
-    public String getBzshbUserId() {
-        return bzshbUserId;
+    public String getInformation() {
+        return information;
     }
 
-    public void setBzshbUserId(String bzshbUserId) {
-        this.bzshbUserId = bzshbUserId;
-    }
-
-    public List<User> getBzshbUserList() {
-        return bzshbUserList;
-    }
-
-    public void setBzshbUserList(List<User> bzshbUserList) {
-        this.bzshbUserList = bzshbUserList;
+    public void setInformation(String information) {
+        information = information;
     }
 
     public List<ProjectFilingbatchRelation> getProjectFilingbatchRelations() {

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -16,6 +16,7 @@ import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
@@ -72,6 +73,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
     private ActTaskService actTaskService;
     @Autowired
     private ActivityService activityService;
+    @Autowired
+    private SerialNumTplService serialNumTplService;
     @Override
     public ProjectFilingBatch get(String id) {
         return super.get(id);
@@ -112,6 +115,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
     @Transactional(readOnly = false)
     public void saveProject(String[] proId,ProjectFilingBatch projectFilingBatch, ProjectStatusEnum projectStatus) throws Exception {
         long t1 = System.currentTimeMillis();
+
         Integer oldStatus = projectFilingBatch.getFilingStatus();
         projectFilingBatch.setFilingStatus(projectStatus.getValue());
         User createBy = projectFilingBatch.getCreateBy();
@@ -127,7 +131,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
         if(projectFilingBatch.getFilingStatus()== ProjectStatusEnum.INVALID.getValue()){
             projectFilingBatch.setId(IdGen.uuid());
             dao.insert(projectFilingBatch);
-        }else if (projectFilingBatch.getFilingStatus()== ProjectStatusEnum.RECALL.getValue()) {
+        }else if (oldStatus== ProjectStatusEnum.RECALL.getValue() || oldStatus== ProjectStatusEnum.REJECTED.getValue()) {
             //获取归档批次的项目信息
             List<ProjectFilingBatch> filingBatches=this.findProjectIdByFiling(projectFilingBatch.getId());
             for (ProjectFilingBatch filingBatch:filingBatches){
@@ -139,6 +143,9 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             }
             dao.update(projectFilingBatch);
         }else{
+            synchronized (SYN_BYTE) {
+                projectFilingBatch.setFilingBatch(serialNumTplService.genSerialNum(createBy.getCompany(), ProjectFilingBatch.ARCHIVE_BATCH_TEMPLATE));
+            }
             super.save(projectFilingBatch);
         }
         //获取前端选择的项目信息
@@ -148,6 +155,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             ProjectFilingbatchRelation filingbatchRelation=new ProjectFilingbatchRelation();
             filingbatchRelation.setFilingBatch(projectFilingBatch.getFilingBatch());
             filingbatchRelation.setProjectId(id);
+            filingbatchRelation.setStatus(2);
             filingbatchRelation.preInsert();
             projectFilingbatchRelationDao.insert(filingbatchRelation);
         }
@@ -374,6 +382,12 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
 
         if (!"yes".equals(projectFilingBatch.getAct().getFlag())) {
             projectFilingBatch.setFilingStatus(ProjectStatusEnum.REJECTED.getValue());
+            for (RuralProjectRecords projectRecords:projectFilingBatch.getProject()){
+                ProjectFilingbatchRelation relation=projectFilingbatchRelationDao.getProjectId(projectRecords.getId());
+                relation.setStatus(ProjectStatusEnum.REJECTED.getValue());
+                this.updateByid(relation);
+            }
+
         }
 
         User createUser = UserUtils.get(projectFilingBatch.getCreateBy().getId());
@@ -434,6 +448,8 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                         }
                     }
                     if (!"yes".equals(projectFilingBatch.getAct().getFlag())) {
+
+
                         notifyRole = "归档批次调整";
                         projectFilingBatch.setFilingStatus(ProjectStatusEnum.REJECTED.getValue());
                         workActivityProcess.setIsApproval("2");

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -302,8 +302,8 @@ public class ProjectFilingBatchController extends BaseController {
      * @param proId
      * @return
      */
+    @RequestMapping("updateProjectPass")
     @ResponseBody
-    @RequestMapping(value = "updateProjectPass")
     public String updateProjectPass(@RequestParam("status") Integer status,@RequestParam("proId") String proId,@RequestParam("boxNum") Integer boxNum,@RequestParam("reboxNum") Integer reboxNum) {
         ProjectFilingbatchRelation filingbatchRelation=new ProjectFilingbatchRelation();
         filingbatchRelation.setProjectId(proId);

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -57,6 +57,14 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private String prrdProcessInstanceId;
     private String reportedProcessInstanceId;
 
+    private String filingBatchId; //归档批次Id
+    private String filingBatch ;//档次批号
+    private String filingProcessinstanceId;// 审批流程id
+    private Integer filingStatus;//归档审批状态
+    private Integer filingProjectStatus;//归档批次项目状态
+    private Integer boxNum; //案卷号
+    private Integer reBoxNum;//确认案卷号
+    private String information; //归档批次信息
 
 
 
@@ -419,4 +427,68 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setPrdId(String prdId) {
         this.prdId = prdId;
     }
+
+    public String getFilingBatchId() {
+        return filingBatchId;
+    }
+
+    public void setFilingBatchId(String filingBatchId) {
+        this.filingBatchId = filingBatchId;
+    }
+
+    public String getFilingBatch() {
+        return filingBatch;
+    }
+
+    public void setFilingBatch(String filingBatch) {
+        this.filingBatch = filingBatch;
+    }
+
+    public String getFilingProcessinstanceId() {
+        return filingProcessinstanceId;
+    }
+
+    public void setFilingProcessinstanceId(String filingProcessinstanceId) {
+        this.filingProcessinstanceId = filingProcessinstanceId;
+    }
+
+    public Integer getFilingStatus() {
+        return filingStatus;
+    }
+
+    public void setFilingStatus(Integer filingStatus) {
+        this.filingStatus = filingStatus;
+    }
+
+    public Integer getFilingProjectStatus() {
+        return filingProjectStatus;
+    }
+
+    public void setFilingProjectStatus(Integer filingProjectStatus) {
+        this.filingProjectStatus = filingProjectStatus;
+    }
+
+    public Integer getBoxNum() {
+        return boxNum;
+    }
+
+    public void setBoxNum(Integer boxNum) {
+        this.boxNum = boxNum;
+    }
+
+    public Integer getReBoxNum() {
+        return reBoxNum;
+    }
+
+    public void setReBoxNum(Integer reBoxNum) {
+        this.reBoxNum = reBoxNum;
+    }
+
+    public String getInformation() {
+        return information;
+    }
+
+    public void setInformation(String information) {
+        this.information = information;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -148,6 +148,17 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String checkUserId; //检查发起人用户id
 	private List<User> bzshbUserList;  //总审用户信息
 
+	//归档批次信息
+	private String filingBatchId; //归档批次Id
+	private String filingBatch ;//档次批号
+	private String filingName;
+	private String filingProcessinstanceId;// 审批流程id
+	private Integer filingStatus;//归档审批状态
+	private Integer filingProjectStatus;//归档批次项目状态
+	private Integer boxNum; //案卷号
+	private Integer reBoxNum;//确认案卷号
+	private String information; //归档批次信息
+
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
@@ -994,4 +1005,76 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setPrdId(String prdId) {
 		this.prdId = prdId;
 	}
+
+	public String getFilingBatch() {
+		return filingBatch;
+	}
+
+	public void setFilingBatch(String filingBatch) {
+		this.filingBatch = filingBatch;
+	}
+
+	public String getFilingProcessinstanceId() {
+		return filingProcessinstanceId;
+	}
+
+	public void setFilingProcessinstanceId(String filingProcessinstanceId) {
+		this.filingProcessinstanceId = filingProcessinstanceId;
+	}
+
+	public Integer getFilingStatus() {
+		return filingStatus;
+	}
+
+	public void setFilingStatus(Integer filingStatus) {
+		this.filingStatus = filingStatus;
+	}
+
+	public Integer getFilingProjectStatus() {
+		return filingProjectStatus;
+	}
+
+	public void setFilingProjectStatus(Integer filingProjectStatus) {
+		this.filingProjectStatus = filingProjectStatus;
+	}
+
+	public Integer getBoxNum() {
+		return boxNum;
+	}
+
+	public void setBoxNum(Integer boxNum) {
+		this.boxNum = boxNum;
+	}
+
+	public Integer getReBoxNum() {
+		return reBoxNum;
+	}
+
+	public void setReBoxNum(Integer reBoxNum) {
+		this.reBoxNum = reBoxNum;
+	}
+
+	public String getInformation() {
+		return information;
+	}
+
+	public void setInformation(String information) {
+		this.information = information;
+	}
+
+	public String getFilingBatchId() {
+		return filingBatchId;
+	}
+
+	public void setFilingBatchId(String filingBatchId) {
+		this.filingBatchId = filingBatchId;
+	}
+
+	public String getFilingName() {
+		return filingName;
+	}
+
+	public void setFilingName(String filingName) {
+		this.filingName = filingName;
+	}
 }

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

@@ -16,6 +16,10 @@ import com.jeeplus.modules.isignature.service.ISignatureDocumentService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
@@ -146,6 +150,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private SubProjectInfoService subProjectInfoService;
+    @Autowired
+    private ProjectFilingbatchRelationDao filingbatchRelationDao;
+    @Autowired
+    private ProjectFilingBatchDao projectFilingBatchDao;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -207,6 +215,20 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             records.setProjectLeaders(users);
             records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
             records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+
+            //获取归档批次信息
+            //项目归档批次
+            ProjectFilingbatchRelation relation=filingbatchRelationDao.getProjectId(records.getId());
+            if(relation!=null && StringUtils.isNotBlank(relation.getId())){
+                records.setFilingBatch(relation.getFilingBatch());
+                records.setFilingProjectStatus(relation.getStatus());
+                records.setBoxNum(relation.getBoxNum());
+                records.setReBoxNum(relation.getReBoxNum());
+                ProjectFilingBatch filingBatch=projectFilingBatchDao.findByFilingBatch(relation.getFilingBatch());
+                records.setFilingBatchId(filingBatch.getId());
+                records.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
+                records.setFilingStatus(filingBatch.getFilingStatus());
+            }
             //判定 如果项目上报信息超期 并且没有上报则江状态改为超期未上报
             /*if(records.getReportedType().equals("1") && !records.getReportedState().equals("5") && !records.getReportedState().equals("7") && null != records.getAuditPassDate()){
                 records.setReportedState("6");
@@ -239,9 +261,23 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     records1.setWorkContractInfo(contractInfo);
                 }
             }
-
             projectRecordTreeData = getParentInfo(records1);
-
+            //获取归档批次信息
+            //项目归档批次
+            ProjectFilingbatchRelation relation=filingbatchRelationDao.getProjectId(records1.getId());
+            if(relation!=null && StringUtils.isNotBlank(relation.getId())){
+                projectRecordTreeData.setFilingBatch(relation.getFilingBatch());
+                projectRecordTreeData.setFilingProjectStatus(relation.getStatus());
+                projectRecordTreeData.setBoxNum(relation.getBoxNum());
+                projectRecordTreeData.setReBoxNum(relation.getReBoxNum());
+                ProjectFilingBatch filingBatch=projectFilingBatchDao.findByFilingBatch(relation.getFilingBatch());
+                projectRecordTreeData.setFilingBatchId(filingBatch.getId());
+                projectRecordTreeData.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
+                projectRecordTreeData.setFilingStatus(filingBatch.getFilingStatus());
+            }else{
+                projectRecordTreeData.setFilingStatus(0);
+                projectRecordTreeData.setFilingProjectStatus(0);
+            }
             projectRecordTreeDataList.add(projectRecordTreeData);
 
         }

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

@@ -354,8 +354,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 						projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.PROJECT_COST_APPRAISAL));
 					}else if(projectRecords.getAttachmentProjectSort().equals("7")){
 						projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.ECONOMIC_EVALUATION));
+					}else{
+						projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_BIZCODE));
 					}
-					projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_BIZCODE));
 				} else if ("2".equals(projectRecords.getProjectType())) {
 					projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_COST_BIZCODE));
 				}

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

@@ -15,6 +15,11 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingBatchDao;
+import com.jeeplus.modules.projectFilingBatch.dao.ProjectFilingbatchRelationDao;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
+import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
+import com.jeeplus.modules.projectFilingBatch.service.ProjectFilingBatchService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
@@ -99,6 +104,12 @@ public class RuralProjectMessageController extends BaseController {
     private ProjectAccessoryRelationService projectAccessoryRelationService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private ProjectFilingBatchService projectFilingBatchService;
+    @Autowired
+    private ProjectFilingbatchRelationDao projectFilingbatchRelationDao;
+    @Autowired
+    private ProjectFilingBatchDao projectFilingBatchDao;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -1571,4 +1582,25 @@ public class RuralProjectMessageController extends BaseController {
         }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
     }
+
+    @RequestMapping(value = "getProcess")
+    public String getProcess(RuralProjectRecords ruralProjectRecords, Model model) {
+        model.addAttribute("processInstanceId", ruralProjectRecords.getFilingProcessinstanceId());
+        ProjectFilingbatchRelation relation=projectFilingbatchRelationDao.getProjectId(ruralProjectRecords.getId());
+        if(relation!=null && org.apache.commons.lang3.StringUtils.isNotBlank(relation.getId())){
+            ruralProjectRecords.setFilingBatch(relation.getFilingBatch());
+            ruralProjectRecords.setFilingProjectStatus(relation.getStatus());
+            ruralProjectRecords.setBoxNum(relation.getBoxNum());
+            ruralProjectRecords.setReBoxNum(relation.getReBoxNum());
+            ProjectFilingBatch filingBatch=projectFilingBatchDao.findByFilingBatch(relation.getFilingBatch());
+            User uu=UserUtils.get(filingBatch.getCreateBy().getId());
+            ruralProjectRecords.setFilingName(uu.getName());
+            ruralProjectRecords.setFilingBatchId(filingBatch.getId());
+            ruralProjectRecords.setFilingProcessinstanceId(filingBatch.getProcessinstanceId());
+            ruralProjectRecords.setFilingStatus(filingBatch.getFilingStatus());
+        }
+        model.addAttribute("ruralProjectRecords", ruralProjectRecords);
+        return "modules/projectFilingBatch/projectFilingBacthTaskTwo";
+    }
+
 }

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

@@ -2708,8 +2708,8 @@ public class WorkProjectNotifyController extends BaseController {
 						ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
 						ruralProjectRecordsList.add(ruralProjectRecords);
 					}
-//					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getFilingBatch());
-//					projectFilingBatch.setProjectFilingbatchRelations(projectFilingbatchRelations);
+					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getFilingBatch());
+					projectFilingBatch.setProjectFilingbatchRelations(projectFilingbatchRelations);
 					//获取归档人
 					projectFilingBatch.setCreateBy(UserUtils.get(projectFilingBatch.getCreateBy().getId()));
 					//项目信息

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -10,7 +10,7 @@
 		a.del_flag AS "delFlag",
 		a.filing_batch AS "filingBatch",
 		a.process_instance_id AS "processinstanceId",
-		a.bzshbUserId AS "bzshbUserId",
+		a.information AS "information",
 		a.filing_status AS "filingStatus"
 	</sql>
 	<sql id="filingBatchRelationColumns">
@@ -23,7 +23,7 @@
 		a.filing_batch AS "filingBatch",
 		a.process_instance_id AS "processinstanceId",
 		a.filing_status AS "filingStatus",
-		a.bzshbUserId AS "bzshbUserId",
+		a.information AS "information",
 		g.project_id AS "projectId",
 		g.status AS "status",
 		g.box_num AS "boxNum",
@@ -32,9 +32,9 @@
 	</sql>
 	<insert id="insert">
 		insert into project_filingbatch
-		(id,create_by,create_date,update_by,update_date,del_flag,filing_batch,process_instance_id,bzshbUserId,filing_status)
+		(id,create_by,create_date,update_by,update_date,del_flag,filing_batch,process_instance_id,information,filing_status)
 		VALUES
-		(#{id},#{createBy.id},#{createDate},#{updateBy.id},#{updateDate},#{delFlag},#{filingBatch},#{processinstanceId},#{bzshbUserId},#{filingStatus})
+		(#{id},#{createBy.id},#{createDate},#{updateBy.id},#{updateDate},#{delFlag},#{filingBatch},#{processinstanceId},#{information},#{filingStatus})
 	</insert>
 	<update id="update">
 		update project_filingbatch
@@ -106,7 +106,6 @@
 		LEFT JOIN project_flingbatch_relation g on(a.filing_batch=g.filing_batch)
 		LEFT JOIN rural_project_records r on(g.project_id=r.project_id)
 		WHERE a.id = #{id}
-		order by a.create_date desc
 	</select>
 	<select id="findProjectIdByFiling" resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch">
 		SELECT
@@ -118,6 +117,16 @@
 		WHERE a.id = #{id}
 		order by a.create_date desc
 	</select>
+	<select id="findByFilingBatch"
+			resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch">
+		SELECT
+		<include refid="filingBatchRelationColumns"/>
+		FROM project_filingbatch a
+		LEFT JOIN project_flingbatch_relation g on(a.filing_batch=g.filing_batch)
+		LEFT JOIN rural_project_records r on(g.project_id=r.id)
+		LEFT JOIN project_report_data d on(d.project_id=r.id)
+		WHERE a.filing_batch = #{filingBatch}
+	</select>
 	<delete id="delete">
 		UPDATE project_filingbatch SET
 			filing_status= 7

src/main/resources/mappings/modules/projectGuidang/ProjectFilingbatchRelationDao.xml

@@ -9,9 +9,10 @@
 		g.update_date AS "updateDate",
 		g.del_flag AS "delFlag",
 		g.filing_batch AS "filingBatch",
+		g.status AS "status",
 		g.project_id AS "projectId",
 		g.box_num AS "boxNum",
-		g.re_box_num AS "reBoxNum",
+		g.re_box_num AS "reBoxNum"
 	</sql>
 	<insert id="insert">
 		insert into project_flingbatch_relation
@@ -55,4 +56,12 @@
 		WHERE g.filing_batch = #{filingBatch}
 		order by a.create_date desc
 	</select>
+	<select id="getProjectId"  resultType="com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation">
+		SELECT
+		<include refid="filingBatchRelationColumns"/>
+		FROM project_filingbatch a
+		LEFT JOIN project_flingbatch_relation g on(a.filing_batch=g.filing_batch)
+		LEFT JOIN rural_project_records r on(g.project_id=r.project_id)
+		WHERE g.project_id = #{projectId}
+	</select>
 </mapper>

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

@@ -226,6 +226,14 @@
 		SELECT
 			<include refid="projectRecordsColumns"/>
 		,
+		pfr.filing_batch AS "filingBatch",
+		pfr.box_num AS "boxNum",
+		pfr.re_box_num AS "reBoxNum",
+		pfr.status AS "filingProjectStatus",
+		pf.id AS "filingBatchId",
+		pf.process_instance_id AS "filingProcessinstanceId",
+		pf.information AS "information",
+		pf.filing_status AS "filingStatus",
 		a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
@@ -262,6 +270,8 @@
 		left join project_report_data prd on prd.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_flingbatch_relation pfr on pfr.project_id=a.id
+		left join project_filingbatch pf on pfr.filing_batch=pf.filing_batch
 		<where>
 			a.status = 5
 			<if test="projectId != null and projectId != ''">
@@ -385,6 +395,8 @@
 		left join project_report_data prd on prd.project_id = a.id
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_flingbatch_relation pfr on pfr.project_id=a.id
+		left join project_filingbatch pf on pfr.filing_batch=pf.filing_batch
         <where>
             a.status = 5
             <if test="projectId != null and projectId != ''">

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

@@ -1379,11 +1379,13 @@
 		<where>
 			and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
-# 		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
+		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
-			${sqlMap.dsf}
+			<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} )
+			</if>
 		</where>
 	</select>
 	<select id="projectFindList" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords">
@@ -1411,17 +1413,19 @@
 
 			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
-# 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
-			${sqlMap.dsf}
+			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
+			<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} )
+			</if>
 		</where>
-<!--		<choose>-->
-<!--			<when test="page !=null and page.orderBy != null and page.orderBy != ''">-->
-<!--				# 					ORDER BY ${page.orderBy}-->
-<!--			</when>-->
-<!--			<otherwise>-->
-<!--				ORDER BY a.update_date DESC-->
-<!--			</otherwise>-->
-<!--		</choose>-->
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				# 					ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
 	</select>
 
 	<select id="getReportRecordStatus" resultType="java.lang.String">

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBacthTaskTwo.jsp

@@ -0,0 +1,94 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>流程追踪</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		function addRow(list, idx, tpl, row){
+			// var idx1 = $("#workClientLinkmanList tr").length;
+			bornTemplete(list, idx, tpl, row, idx);
+		}
+
+		function bornTemplete(list, idx, tpl, row, idx1){
+			$(list).append(Mustache.render(tpl, {
+				idx: idx, delBtn: true, row: row,
+				order:idx1 + 1
+			}));
+			$(list+idx).find("select").each(function(){
+				$(this).val($(this).attr("data-value"));
+			});
+			$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+				var ss = $(this).attr("data-value").split(',');
+				for (var i=0; i<ss.length; i++){
+					if($(this).val() == ss[i]){
+						$(this).attr("checked","checked");
+					}
+				}
+			});
+		}
+	</script>
+</head>
+<body class="gray-bg">
+<div class="single-form">
+	<div class="container view-form">
+			<div class="tabs-container" style="margin-top: 20px;">
+				<ul class="nav nav-tabs">
+					<li class="active"><a data-toggle="tab" href="#tab-11"  aria-expanded="true">流程信息</a>
+					</li>
+					<li class=""><a data-toggle="tab" href="#tab-22"  aria-expanded="false">归档批次信息</a>
+					</li>
+				</ul>
+				<div class="tab-content">
+					<div id="tab-11" class="tab-pane active">
+						<div class="container form layui-form">
+							<act:flowChart procInsId="${processInstanceId}"/>
+							<act:histoicFlow procInsId="${processInstanceId}"/>
+						</div>
+					</div>
+					<div id="tab-22" class="tab-pane">
+						<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="" method="post" class="form-horizontal">
+						<div style="margin-top: 20px;">
+							<div class="layui-item layui-col-sm6 lw6">
+								<label class="layui-form-label">归档批次号：</label>
+								<div class="layui-input-block">
+									<form:input path="filingBatch" id="filingBatch"  readonly="true" class="form-control layui-input" />
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6 lw6">
+								<label class="layui-form-label">归档人：</label>
+								<div class="layui-input-block">
+									<form:input path="filingName" id="filingName"  readonly="true" class="form-control layui-input" />
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6 lw6">
+								<label class="layui-form-label">案卷号：</label>
+								<div class="layui-input-block">
+									<form:input path="boxNum" id="boxNum"  readonly="true" class="form-control layui-input" />
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6 lw6">
+								<label class="layui-form-label">确认案卷号：</label>
+								<div class="layui-input-block">
+									<form:input path="reBoxNum" id="reBoxNum"  readonly="true" class="form-control layui-input" />
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm12 lw7">
+								<label class="layui-form-label">归档信息：</label>
+								<div class="layui-input-block">
+									<form:textarea path="information" htmlEscape="false" readonly="true" rows="4" maxlength="200" class="form-control"/>
+								</div>
+							</div>
+						</div>
+						</form:form>
+					</div>
+
+
+					<div class="form-group layui-row page-end"></div>
+				</div>
+			</div>
+	</div>
+</div>
+</body>
+</html>
+

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchApply.jsp

@@ -101,18 +101,24 @@
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>归档批次信息</h2></div>
 				<div >
-					<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">归档批次号：</label>
 						<div class="layui-input-block">
 							<form:input path="filingBatch" id="filingBatch"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">归档人：</label>
 						<div class="layui-input-block">
 							<form:input path="createBy.name" id="createBy"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
+					<div class="layui-item layui-col-sm12 lw7">
+						<label class="layui-form-label">归档信息：</label>
+						<div class="layui-input-block">
+							<form:textarea path="information" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
+						</div>
+					</div>
 				</div>
 			</div>
 			<div class="form-group layui-row first">

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -5,6 +5,8 @@
 	<title>审批管理</title>
 	<meta name="decorator" content="default"/>
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -18,13 +20,24 @@
                         $("#flag").val("no2");
 					}
                 }
-                if ($("#clientType").val()!=null){
+                var flag=true;
+				$("#workClientLinkmanList tr").each(function(){
+					var clientType=$(this).find("td").eq(5).find(".clientType").val();
+					var reboxNum=$(this).find("td").eq(4).find(".reboxNum").val();
+					var boxNum=$(this).find("td").eq(3).find(".boxNum").val();
+					if (boxNum =="" && reboxNum=="" && clientType==""){
+						layer.msg("请输入项目信息", { icon: 2, offset: "error", time:2000 });
+						flag=false;
+					}
+				})
+                if (flag==true){
 					$("#inputForm").submit();
+					return true;
 				}else{
 					layer.msg("请输入项目信息", { icon: 2, offset: "error", time:2000 });
 				}
 
-                return true;
+
             }
 	
 		  return false;
@@ -103,7 +116,7 @@
 <body >
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectFilingBatch" enctype="multipart/form-data" action="${ctx}/projectFilingBatch/projectFilingBatchInfo/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectFilingBatch" enctype="multipart/form-data" action="${ctx}/projectFilingBatch/projectFilingBatchInfo/saveAudit" method="post" class="layui-form">
 		<form:hidden path="id"/>
 		<form:hidden path="home"/>
 		<form:hidden path="act.taskId"/>
@@ -116,18 +129,24 @@
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>归档批次信息</h2></div>
 				<div >
-					<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">归档批次号：</label>
 						<div class="layui-input-block">
 							<form:input path="filingBatch" id="filingBatch"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">归档人：</label>
 						<div class="layui-input-block">
 							<form:input path="createBy.name" id="createBy"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
+					<div class="layui-item layui-col-sm12 lw7">
+						<label class="layui-form-label">归档信息：</label>
+						<div class="layui-input-block">
+							<form:textarea path="information" readonly="true" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
+						</div>
+					</div>
 				</div>
 			</div>
 			<div class="form-group layui-row first">
@@ -139,36 +158,46 @@
 							<th style="text-align: center">归档项目编号</th>
 							<th style="text-align: center" >归档项目名称</th>
 							<th style="text-align: center">报告号</th>
-							<th style="text-align: center" >盒号</th>
-							<th style="text-align: center" >确认盒号</th>
+							<th style="text-align: center" >案卷号</th>
+							<th style="text-align: center" >确认案卷号</th>
 							<th style="text-align: center" >操作</th>
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
-						<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
-							<tr>
-								<td>
-									<input name="projectId" type="text" readonly value="${project.projectId}" class="form-control"/>
-								</td>
-								<td>
-									<input name="projectName" type="text" readonly value="${project.projectName}" class="form-control"/>
-								</td>
-								<td>
-									<input name="projectReportNumber" type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
-								</td>
-								<td><input id="boxNum" type="text" value="${projectFilingBatch.boxNum}" class="form-control"/></td>
-								<td><input id="reboxNum" onchange="upcase(this)" value="${projectFilingBatch.reBoxNum}" type="text" class="form-control"/></td>
-								<td>
-									<input type="hidden" id="getProId" value="${project.id}"/>
-									<select onchange="proType(this)" id="clientType" class="form-control simple-select required">
-										<option value="" label="--是否通过--"/>
-										<option value="5" itemLabel="label">通过</option>
-										<option value="4" itemLabel="label">驳回</option>
-									</select>
-								</td>
-
-							</tr>
-						</c:forEach>
+						<c:choose>
+							<c:when test="${not empty projectFilingBatch}">
+								<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
+									<tr>
+										<td>
+											<input name="projectId" type="text" readonly value="${project.projectId}" class="form-control"/>
+										</td>
+										<td>
+											<input name="projectName" type="text" readonly value="${project.projectName}" class="form-control"/>
+										</td>
+										<td>
+											<input name="projectReportNumber" type="text" readonly value="${project.projectReportNumber}" class="form-control required"/>
+										</td>
+										<td><input name="boxNum" id="boxNum" type="text" value="${projectFilingBatch.boxNum}" class="form-control required boxNum"/></td>
+										<td><input name="reboxNum" id="reboxNum" onchange="upcase(this)" value="${projectFilingBatch.reBoxNum}" type="text" class="form-control required reboxNum"/></td>
+										<td style="overflow: visible;">
+											<input type="hidden" id="getProId" value="${project.id}"/>
+											<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select required clientType">
+												<option value="" >--是否通过--</option>
+												<option value="5" itemLabel="label">通过</option>
+												<option value="4" itemLabel="label">驳回</option>
+											</select>
+										</td>
+									</tr>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="7">
+										暂无数据
+									</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
 						</tbody>
 					</table>
 			</div>
@@ -182,7 +211,40 @@
 			</div>
 	</div>
 </div>
-<script>
+<script type="text/javascript">
+	layui.use(['form', 'layer'], function () {
+		var form = layui.form;
+		//下拉框监听器
+		layui.form.on('select(cc)', function(data){
+			var tr=$(this).parent().parent().parent().parent()
+			var boxNum=$(tr).find(".boxNum").val();
+			var reboxNum=$(tr).find(".reboxNum").val();
+			var proId=(tr).find("#getProId").val();
+			var status=$(tr).find("#clientType").val();
+			if (status!="" && boxNum!="" && reboxNum !=""){
+				//修改项目状态
+				$.ajax({
+					type : "POST",
+					url : "${ctx}/projectFilingBatch/projectFilingBatchInfo/updateProjectPass",
+					data : {
+						'status':status,
+						'proId':proId,
+						"boxNum":boxNum,
+						"reboxNum":reboxNum
+					},
+					//请求成功
+					success : function(result) {
+						// layer.msg("项目状态修改成功", { icon: 1, offset: "auto", time:2000 });
+					},
+				});
+			}else{
+				layer.msg("请输入前面信息", { icon: 2, offset: "error", time:2000 });
+			}
+
+		});
+	});
+</script>
+<script type="text/javascript">
 	function upcase(obj) {
 		var tr=obj.parentNode.parentNode;
 		var boxNum=jQuery(tr).find("#boxNum").val()
@@ -190,13 +252,13 @@
 		if (boxNum!=""){
 			if (reboxNum!=""){
 				if(boxNum!=reboxNum){
-					layer.msg("确认盒号与盒号不匹配", { icon: 2, offset: "error", time:2000 });
+					layer.msg("确认案卷号与案卷号不匹配", { icon: 2, offset: "error", time:2000 });
 				}
 			}else{
-				layer.msg("请输入再次确认盒号", { icon: 2, offset: "error", time:2000 });
+				layer.msg("请输入再次确认案卷号", { icon: 2, offset: "error", time:2000 });
 			}
 		}else{
-			layer.msg("请输入盒号", { icon: 2, offset: "error", time:2000 });
+			layer.msg("请输入案卷号", { icon: 2, offset: "error", time:2000 });
 		}
 	}
 	function proType(obj) {
@@ -209,28 +271,30 @@
 			if (reboxNum!=""){
 				if(boxNum!=reboxNum){
 				}else{
-					//修改项目状态
-					$.ajax({
-						type : "POST",
-						url : "${ctx}/projectFilingBatch/projectFilingBatchInfo/updateProjectPass",
-						data : {
-							'status':pass,
-							'proId':proId,
-							"boxNum":boxNum,
-							"reboxNum":reboxNum
-						},
-						//请求成功
-						success : function(result) {
-							layer.msg("项目状态修改成功", { icon: 1, offset: "auto", time:2000 });
-						},
 
-					});
+					<%--//修改项目状态--%>
+					<%--$.ajax({--%>
+					<%--	type : "POST",--%>
+					<%--	url : "${ctx}/projectFilingBatch/projectFilingBatchInfo/updateProjectPass",--%>
+					<%--	data : {--%>
+					<%--		'status':pass,--%>
+					<%--		'proId':proId,--%>
+					<%--		"boxNum":boxNum,--%>
+					<%--		"reboxNum":reboxNum--%>
+					<%--	},--%>
+					<%--	//请求成功--%>
+					<%--	success : function(result) {--%>
+					<%--		layer.msg("项目状态修改成功", { icon: 1, offset: "auto", time:2000 });--%>
+					<%--	},--%>
+
+					<%--});--%>
 				}
 			}else{
-				layer.msg("请输入再次确认盒号", { icon: 2, offset: "error", time:2000 });
+				layer.msg("请输入再次确认案卷号", { icon: 2, offset: "error", time:2000 });
 			}
 		}
 	}
+
 </script>
 </body>
 </html>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchForm.jsp

@@ -657,9 +657,9 @@
             <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="filingBatch" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="filingBatch" htmlEscape="false" readonly="true"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -669,6 +669,12 @@
                         <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label">归档信息：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="information" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
+                    </div>
+                </div>
             </div>
 
             <div class="form-group layui-row">

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -240,13 +240,13 @@
             ,page: false
             ,cols: [[
                 // {checkbox: true, fixed: true},
-                {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'filingBatch',align:'center', title: '归档批次号',minWidth:200,templet:function(d){
+                {field:'index',align:'center', title: '序号',width:"5%"}
+                ,{field:'filingBatch',align:'center',width:'20%', title: '归档批次号',templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.filingBatch + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看批次', '${ctx}/projectFilingBatch/projectFilingBatchInfo/view?id=" + d.id +"','95%', '95%')\">" + d.filingBatch + "</a>";
                     }}
-                ,{field:'createName',align:'center', title: '创建人',  width:80}
-                ,{field:'createDate',align:'center', title: '创建日期',  width:80}
-                ,{align:'center', title: '状态',  width:70,templet:function(d){
+                ,{field:'createName',align:'center', title: '创建人',  width:'20%'}
+                ,{field:'createDate',align:'center', title: '创建日期',  width:'20%'}
+                ,{align:'center', title: '状态',  width:'20%',templet:function(d){
                         var st = getAuditState(d.filingStatus);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectFilingBatch/projectFilingBatchInfo/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -254,7 +254,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:'15%',templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
@@ -281,11 +281,11 @@
                         {
                             <%--xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";--%>
                         }
-                        if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        // if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
+                        // {
+                            <%--xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改4</a>";--%>
                             <%--xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";--%>
-                        }
+                        // }
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchView.jsp

@@ -217,9 +217,9 @@
             <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="filingBatch" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="filingBatch" htmlEscape="false" readonly="true"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -229,6 +229,12 @@
                         <form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm12 lw7">
+                    <label class="layui-form-label">归档信息：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="information" htmlEscape="false" readonly="true" rows="4" maxlength="200" class="form-control "/>
+                    </div>
+                </div>
             </div>
 
             <div class="form-group layui-row">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -595,16 +595,12 @@
 							}
 						}},
 					/*{align:'center', title: '线下归档状态',  width:70,templet:function(d){
-							var st = getRuralProjectArchiveState(""+d.downProjectReportRecordStatus);
-							if(d.pid ==0){
-								if(st.action)
-									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-								else
-									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-								return xml;
-							}else{
-								return '';
-							}
+							var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
+							if(st.action)
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcess?filingProcessinstanceId=" + d.filingProcessinstanceId+"&id="+d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							else
+								var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							return xml;
 						}},*/
 					{align:'center', title: '上报状态',  width:90,templet:function(d){
 							var st = getReportedState(""+d.reportedState);

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -486,7 +486,6 @@
                         <form:select path="companyType" class="form-control simple-select required" id="companyType">
                             <form:option value="" label="--请选择客户性质--"/>
                             <form:options items="${fns:getMainDictList('company_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-
                         </form:select>
                     </div>
                 </div>

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

@@ -871,7 +871,6 @@
 		if ($("#id").val() || $("#aId").val()) {
 			workClientInfoListRowIdx = ${fn:length(workContractInfo.workClientInfoList)};
 		}
-
 	</script>
 </div>
 </body>