签证类型CRUD

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectContentChangeDao.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.projectcontentinfo.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentDataRelevance;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,5 @@ import java.util.List;
 public interface ProjectContentChangeDao extends CrudDao<Projectcontentinfo> {
     List<Projectcontentinfo> getByInfoId(@Param("infoId")String infoId);
     int deleteChange(Projectcontentinfo projectcontentinfo);
+    int saveProjectContentDataRelevanceInfo(ProjectContentDataRelevance projectContentDataRelevance);
 }

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

@@ -4,8 +4,6 @@
 package com.jeeplus.modules.projectcontentinfo.entity;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.persistence.TreeEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -24,9 +24,9 @@ import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
+import com.jeeplus.modules.workcontent.common.WorkContentDetailFactory;
 import com.jeeplus.modules.workcontent.entity.WorkContentType;
 import com.jeeplus.modules.workcontent.service.WorkContentDetailBaseService;
-import com.jeeplus.modules.workcontent.common.WorkContentDetailFactory;
 import com.jeeplus.modules.workcontent.service.WorkContentTypeService;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
 
@@ -135,6 +134,9 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		page.setList(findList(projectcontentinfo));
 		return super.findPage(page, projectcontentinfo);
 	}
+	public Page<ProjectContractContentAlterData> getContractContentAlterDataInfo(Page<ProjectContractContentAlterData> page, ProjectContractContentAlterData projectContractContentAlterData){
+		return null;
+	}
 
 	@Transactional(readOnly = false)
 	public void save(Projectcontentinfo projectcontentinfo) {
@@ -150,6 +152,10 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		projectContentChangeDao.deleteChange(projectcontentinfo);
 	}
 	@Transactional(readOnly = false)
+	public void saveProjectContentDataRelevanceInfo(ProjectContentDataRelevance projectContentDataRelevance) {
+		projectContentChangeDao.saveProjectContentDataRelevanceInfo(projectContentDataRelevance);
+	}
+	@Transactional(readOnly = false)
 	public String saveData(Projectcontentinfo projectcontentinfo,int type) throws Exception {
 		List<ProjectControlTable> projectControlTableList = null;
 		List<ProjectBasedData> projectBasedDataList = null;
@@ -164,6 +170,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 		Projectcontentinfo s = new Projectcontentinfo();
 		s.setParentIds("0,");
 		s.setProject(projectcontentinfo.getProject());
+		//根据项目id查询相关工作内容信息的数据 并将其存为父级数据
 		Projectcontentinfo contentinfo = dao.findListByProject(s).get(0);
 		String parentIds = projectcontentinfo.getParentIds();
 		String parentId = projectcontentinfo.getParentId();
@@ -401,6 +408,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 					select.setParentIds(parentIds);
 					select.setType(count);
 					select.setProject(projectcontentinfo.getProject());
+					//根据项目信息查找添加的数据的上级节点信息
 					List<Projectcontentinfo> infos = dao.findListByProjectAndType(select);
 					if (infos == null || infos.size()==0) {
                         select.setParent(parent);
@@ -432,6 +440,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}
 			if (!count.equals("8")) {
+				//根据项目id查询工作内容信息并塞入树形图结构中
 				Projectcontentinfo select1 = new Projectcontentinfo();
 				List<Projectcontentinfo> projectcontentinfos = dao.findType(projectcontentinfo.getProject().getId(),name);
 				if(projectcontentinfos.size()>0){

src/main/java/com/jeeplus/modules/workcontent/common/WorkContentDetailFactory.java

@@ -23,6 +23,8 @@ public class WorkContentDetailFactory {
     private static WorkContentBiddingplanService biddingplanService = SpringContextHolder.getBean(WorkContentBiddingplanService.class);
     //变更管理Service
     private static WorkContentAltermanageService altermanageService = SpringContextHolder.getBean(WorkContentAltermanageService.class);
+    //签证管理Service
+    private static WorkContentVisamanageService visamanageService = SpringContextHolder.getBean(WorkContentVisamanageService.class);
     //价差管理Service
     private static WorkContentPriceadjustService priceadjustService = SpringContextHolder.getBean(WorkContentPriceadjustService.class);
     //合同管理Service
@@ -52,6 +54,8 @@ public class WorkContentDetailFactory {
                 return pricemanageService;
             case "43":
                 return altermanageService;
+            case "45":
+                return visamanageService;
             case "46":
                 return contentClaimService;
             case "47":

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentAltermanage.java

@@ -3,16 +3,15 @@
  */
 package com.jeeplus.modules.workcontent.entity;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.NotNull;
-
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
 import org.springframework.format.annotation.NumberFormat;
 
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
 /**
  * 变更管理Entity
  * @author ssrh
@@ -36,7 +35,34 @@ public class WorkContentAltermanage extends DataEntity<WorkContentAltermanage> {
 	private Date setDate;		// 审定日期
 	private String inAccount;		// 计入台账
 	private String inPayment;		// 计入支付
-	
+	private String proConTentName;
+	private String typeName;
+	private String createName;
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
+	public String getProConTentName() {
+		return proConTentName;
+	}
+
+	public void setProConTentName(String proConTentName) {
+		this.proConTentName = proConTentName;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
 	public WorkContentAltermanage() {
 		super();
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentClaim.java

@@ -3,15 +3,15 @@
  */
 package com.jeeplus.modules.workcontent.entity;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.NotNull;
-
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
 import org.springframework.format.annotation.NumberFormat;
 
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
 /**
  * 索赔管理Entity
  * @author ssrh
@@ -34,7 +34,35 @@ public class WorkContentClaim extends DataEntity<WorkContentClaim> {
 	private Date setDate;		// 审定日期
 	private String inAccount;		// 计入台账
 	private String inPayment;		// 计入支付
-	
+	private String proConTentName;
+	private String typeName;
+
+	private String createName;
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
+	public String getProConTentName() {
+		return proConTentName;
+	}
+
+	public void setProConTentName(String proConTentName) {
+		this.proConTentName = proConTentName;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
 	public WorkContentClaim() {
 		super();
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentContractinfo.java

@@ -3,17 +3,16 @@
  */
 package com.jeeplus.modules.workcontent.entity;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.NotNull;
-
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
 import org.springframework.format.annotation.NumberFormat;
 
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 合同登记Entity
  * @author ssrh
@@ -50,7 +49,27 @@ public class WorkContentContractinfo extends DataEntity<WorkContentContractinfo>
 	private Date startDate;		// 开始日期
 	private Date endDate;		// 结束日期
     List<WorkContentContractTerm> termList;
-	
+
+    private String createName; //操作人名称
+
+    private String proConTentName;//关联合同名称
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
+	public String getProConTentName() {
+		return proConTentName;
+	}
+
+	public void setProConTentName(String proConTentName) {
+		this.proConTentName = proConTentName;
+	}
+
 	public WorkContentContractinfo() {
 		super();
 	}

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentSummary.java

@@ -10,7 +10,33 @@ public class WorkContentSummary extends DataEntity<WorkContentSummary> {
     private Double money;  //钱
     private String name;  //合同名称
     private String userName;  //操作人
+    private String proContentName;//工作内容名称
+    private String createName;
+    private Double adjustMoney; //调整后的金额
 
+    public Double getAdjustMoney() {
+        return adjustMoney;
+    }
+
+    public void setAdjustMoney(Double adjustMoney) {
+        this.adjustMoney = adjustMoney;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getProContentName() {
+        return proContentName;
+    }
+
+    public void setProContentName(String proContentName) {
+        this.proContentName = proContentName;
+    }
 
     public String getUserName() {
         return userName;

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentContractSumController.java

@@ -93,36 +93,57 @@ public class WorkContentContractSumController extends BaseController {
 		}
 		if(oldRecord!=null){
 			String conId = oldRecord.getContentId();
-			List<WorkContentAltermanage> workContentAltermanages = workContentAltermanageDao.findByConId(conId);
+			//获取变更信息
+			//List<WorkContentAltermanage> workContentAltermanages = workContentAltermanageDao.findByConId(conId);
+			//获取变更信息和索赔信息
 			List<WorkContentClaim> workContentClaims = workContentClaimDao.findByConId(conId);
+			//获取合同信息
 			List<WorkContentContractinfo> workContentContractinfos = workContentContractinfoDao.findByConId(conId);
 			List<WorkContentSummary> list = new ArrayList();
 			WorkContentSummary workContentSummary = null;
+			//初始化一个金额
+			Double originalMoney = null;
 			if(null != workContentContractinfos && workContentContractinfos.size() >0){
 				for(WorkContentContractinfo workContentContractinfo : workContentContractinfos) {
 					workContentSummary = new WorkContentSummary();
 					workContentSummary.setType("合同信息");
 					workContentSummary.setName(name);
 					workContentSummary.setDate(workContentContractinfo.getUpdateDate());
-					workContentSummary.setMoney(workContentContractinfo.getTrueAmt());
+					if (null != workContentContractinfo.getTrueAmt()) {
+						workContentSummary.setAdjustMoney(workContentContractinfo.getTrueAmt());
+						workContentSummary.setMoney(0D);
+					}else{
+						workContentSummary.setMoney(workContentContractinfo.getTrueAmt());
+					}
+					workContentSummary.setProContentName(workContentContractinfo.getProConTentName());
+					workContentSummary.setCreateName(workContentContractinfo.getCreateName());
+					originalMoney = workContentContractinfo.getTrueAmt();
 					list.add(workContentSummary);
 				}
 			}
-			if(null != workContentAltermanages && workContentAltermanages.size() >0){
+			/*if(null != workContentAltermanages && workContentAltermanages.size() >0){
 				for(WorkContentAltermanage workContentAltermanage : workContentAltermanages) {
 					workContentSummary = new WorkContentSummary();
-					workContentSummary.setType("合同变更");
+					workContentSummary.setType(workContentAltermanage.getTypeName());
 					workContentSummary.setDate(workContentAltermanage.getUpdateDate());
 					workContentSummary.setMoney(workContentAltermanage.getSetAmt());
+					workContentSummary.setProContentName(workContentAltermanage.getProConTentName());
+					workContentSummary.setCreateName(workContentAltermanage.getCreateName());
 					list.add(workContentSummary);
 				}
-			}
+			}*/
 			if(null != workContentClaims && workContentClaims.size() >0){
 				for(WorkContentClaim workContentClaim : workContentClaims) {
 					workContentSummary = new WorkContentSummary();
-					workContentSummary.setType("索赔");
+					workContentSummary.setType(workContentClaim.getTypeName());
 					workContentSummary.setDate(workContentClaim.getUpdateDate());
 					workContentSummary.setMoney(workContentClaim.getSetAmt());
+					if (null != originalMoney) {
+						workContentSummary.setAdjustMoney(originalMoney - workContentClaim.getSetAmt());
+						originalMoney = workContentSummary.getAdjustMoney();
+					}
+					workContentSummary.setProContentName(workContentClaim.getProConTentName());
+					workContentSummary.setCreateName(workContentClaim.getCreateName());
 					list.add(workContentSummary);
 				}
 			}

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

@@ -172,6 +172,18 @@
 		WHERE info_id = #{infoId} AND project_id = #{project.id}
 	</update>
 
+	<insert id="saveProjectContentDataRelevanceInfo">
+		insert into project_content_data_relevance (
+		  project_content_id,
+		  project_content_dynamic_id
+		)
+		values
+		  (
+			#{projectContentId},
+			#{projectContentDynamicId}
+		  ) ;
+	</insert>
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
 		UPDATE project_content_change SET 

src/main/resources/mappings/modules/workcontent/WorkContentAltermanageDao.xml

@@ -69,10 +69,15 @@
 	<select id="findByConId" parameterType="String" resultType="WorkContentAltermanage">
        SELECT
 		<include refid="workContentAltermanageColumns"/>
+		,pcd.name as 'proConTentName',wct.type_name as 'typeName',su.name as 'createName'
 		FROM work_content_altermanage a
 		<include refid="workContentAltermanageJoins"/>
+		left join project_content_data pcd on pcd.id =a.content_id
+		left join project_content_info pci on pci.info_id = a.content_id
+		left join work_content_type wct on wct.type_id = pci.dict_type
+        left join sys_user su on su.id = a.create_by
 		<where>
-			a.cont_id = #{conId}
+			a.cont_id = #{conId} and pcd.del_flag=0
 		</where>
 	</select>
 	

src/main/resources/mappings/modules/workcontent/WorkContentClaimDao.xml

@@ -41,11 +41,22 @@
 	</select>
 
 	<select id="findByConId" resultType="WorkContentClaim" parameterType="String">
-		SELECT
-		<include refid="workContentClaimColumns"/>
-		FROM work_content_claim a
-		<include refid="workContentClaimJoins"/>
-		WHERE a.contract_id = #{conId}
+		select wcc.review_amt  as 'reviewAmt',wcc.set_amt as 'setAmt',wcc.content_id as 'contentId',pcd2.name as 'proConTentName',wcc.cont_id as 'contractId',
+		wct.type_name as 'typeName',wcc.create_date as 'createDate',wcc.update_date as 'updateDate', pcd.name as 'name',
+		wct.type_name as 'typeName',su.name as 'createName'
+		from (select id,create_by,create_date,update_by,update_date,remarks,del_flag,project_id,content_id,cont_id,alter_type,alter_date,review_amt,set_amt  from work_content_altermanage
+		union all
+		select id,create_by,create_date,update_by,update_date,remarks,del_flag,project_id,content_id,contract_id,claim_type,claim_date,review_amt,set_amt from work_content_claim
+		union all
+		select id,create_by,create_date,update_by,update_date,remarks,del_flag,project_id,content_id,cont_id,visa_type,
+		visa_date,review_amt,set_amt from work_content_visamanage) as  wcc
+		left join project_content_data pcd on wcc.cont_id = pcd.id
+		left join project_content_data pcd2 on pcd2.id =wcc.content_id
+		left join project_content_info pci on pci.info_id = wcc.content_id
+		left join work_content_type wct on wct.type_id = pci.dict_type
+		left join sys_user su on su.id = wcc.create_by
+		where pcd.id = #{conId} and pci.info_id is not null
+		order by wcc.update_date asc
 	</select>
 	
 	<select id="findList" resultType="WorkContentClaim" >

src/main/resources/mappings/modules/workcontent/WorkContentContractinfoDao.xml

@@ -76,10 +76,13 @@
 	<select id="findByConId" resultType="WorkContentContractinfo" parameterType="String">
 		SELECT
 		<include refid="workContentContractinfoColumns"/>
+		,pcd.name as 'proContentName',su.name as 'createName'
 		FROM work_content_contractinfo a
 		<include refid="workContentContractinfoJoins"/>
+		LEFT JOIN  project_content_data pcd ON pcd.id = a.content_id
+		left join sys_user su on su.id = a.create_by
 		<where>
-			content_id = #{id}
+			content_id = #{id} and pcd.del_flag=0
 		</where>
 	</select>
 

src/main/webapp/webpage/modules/projectcontentinfo/workContentForm.jsp

@@ -191,6 +191,9 @@
                 case '43':
                     $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
                     break;
+                case '45':
+                    $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
+                    break;
                 case '46':
                     $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
                     break;

src/main/webapp/webpage/modules/projectcontentinfo/workContentView.jsp

@@ -175,6 +175,9 @@
                 case '43':
                     $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
                     break;
+                case '45':
+                    $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
+                    break;
                 case '46':
                     $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
                     break;

src/main/webapp/webpage/modules/workcontent/workContentContractSumFormView.jsp

@@ -143,9 +143,12 @@
             ,page: false
             ,cols: [[
                 {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'type',align:'center', title: '类型',minWidth:200}
+                ,{field:'proContentName',align:'center', title: '工作内容名称',width:200}
+                ,{field:'type',align:'center', title: '类型',minWidth:100}
+                ,{field:'createName',align:'center', title: '操作人',minWidth:100}
                 ,{field:'date',align:'center', title: '操作时间',width:150}
-                ,{field:'money',align:'center', title: '变更金额',width:150}
+                ,{field:'money',align:'center', title: '调整金额',width:150}
+                ,{field:'adjustMoney',align:'center', title: '调整后金额',width:150}
             ]]
             ,data: [
                 <c:if test="${ not empty workContentContractSum.workContentSummaries}">
@@ -153,9 +156,12 @@
                 <c:if test="${index.index != 0}">,</c:if>
                 {
                     "index":"${index.index+1}"
+                    ,"proContentName":"${w.proContentName}"
                     ,"type":"${w.type}"
+                    ,"createName":"${w.createName}"
                     ,"date":"<fmt:formatDate value="${w.date}" pattern="yyyy-MM-dd"/>"
                     ,"money":"${w.money}"
+                    ,"adjustMoney":"${w.adjustMoney}"
                 }
                 </c:forEach>
                 </c:if>