更新

src/main/java/com/jeeplus/modules/workcontent/dao/WorkScheduleDao.java

@@ -34,4 +34,11 @@ public interface WorkScheduleDao extends CrudDao<WorkScheduleInfo> {
      * @return
      */
     List<String> getTableType(String contentId);
+
+    /**
+     * 根据项目id查询所有有关项目的信息
+     * @param workScheduleInfo
+     * @return
+     */
+    List<WorkScheduleInfo> findListByProjectId(WorkScheduleInfo workScheduleInfo);
 }

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

@@ -46,6 +46,8 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 	private Double currentTotalPaymentMoney;		// 已累计支付价款
 	private String currentPayRatio;		// 支付比例
 	private String type;          //数据状态
+	private String contractName;          //合同名称
+	private String contractNumber;          //合同编号
 
 	public WorkScheduleInfo() {
 		super();
@@ -182,4 +184,20 @@ public class WorkScheduleInfo extends DataEntity<WorkScheduleInfo> {
 	public void setContractId(String contractId) {
 		this.contractId = contractId;
 	}
+
+	public String getContractName() {
+		return contractName;
+	}
+
+	public void setContractName(String contractName) {
+		this.contractName = contractName;
+	}
+
+	public String getContractNumber() {
+		return contractNumber;
+	}
+
+	public void setContractNumber(String contractNumber) {
+		this.contractNumber = contractNumber;
+	}
 }

src/main/java/com/jeeplus/modules/workcontent/service/WorkScheduleService.java

@@ -32,6 +32,10 @@ public class WorkScheduleService extends CrudService<WorkScheduleDao, WorkSchedu
 	public List<WorkScheduleInfo> findList(WorkScheduleInfo workPreliminaryDesignEstimate) {
 		return super.findList(workPreliminaryDesignEstimate);
 	}
+
+	public List<WorkScheduleInfo> findListByProjectId(WorkScheduleInfo workPreliminaryDesignEstimate) {
+		return dao.findListByProjectId(workPreliminaryDesignEstimate);
+	}
 	
 	public Page<WorkScheduleInfo> findPage(Page<WorkScheduleInfo> page, WorkScheduleInfo workPreliminaryDesignEstimate) {
 		return super.findPage(page, workPreliminaryDesignEstimate);

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

@@ -84,6 +84,28 @@ public class WorkScheduleController extends BaseController {
 	}
 
 
+
+	/**
+	 * 根据projectId获取项目中所有的工程进度款数据信息
+	 */
+	@RequestMapping(value = {"listByProjectId", ""})
+	public String listByProjectId(WorkScheduleInfo workScheduleInfo,String view, HttpServletRequest request, Model model) {
+		String sign = request.getParameter("sign");
+		List<String> signList = new ArrayList();
+		if (StringUtils.isNotBlank(sign)){
+			signList = Arrays.asList(sign.split(","));
+		}
+		List<WorkScheduleInfo> list = new ArrayList<>();
+		if(StringUtils.isNotBlank(workScheduleInfo.getProjectId())){
+			list = workScheduleService.findListByProjectId(workScheduleInfo);
+		}
+		model.addAttribute("signList", signList);
+		model.addAttribute("workScheduleList", list);
+		String viewPath = "modules/workcontent/workProjectScheduleListView";
+		return viewPath;
+	}
+
+
 	/**
 	 * 查询数据表中的所有数据类型
 	 * @return

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

@@ -58,6 +58,28 @@
 			</otherwise>
 		</choose>
 	</select>
+
+	<select id="findListByProjectId" resultType="com.jeeplus.modules.workcontent.entity.WorkScheduleInfo" >
+		SELECT
+			cc.contract_name contractName, cc.cnumber contractNumber,
+		<include refid="workPreliminaryDesignEstimateColumns"/>
+		FROM work_schedule_info a
+		left join construction_contract cc on cc.id = a.contract_id
+		<where>
+            <if test="projectId!=null and projectId !=''">
+                AND a.project_id = #{projectId}
+            </if>
+			AND a.del_flag = #{DEL_FLAG_NORMAL}
+		</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>
+	</select>
 	
 	<select id="findAllList" resultType="com.jeeplus.modules.workcontent.entity.WorkScheduleInfo" >
 		SELECT