修改总包合同

This commit is contained in:
2023-09-05 15:17:21 +08:00
parent 390865d563
commit b53e552cfa
10 changed files with 48 additions and 213 deletions
@@ -36,12 +36,10 @@ namespace FineUIPro.Web.ZHGL.Plan
/// </summary>
private void BindGrid()
{
string strSql = "SELECT MainContract.MainContractId,MainContract.ProjectId,Project.ProjectName,MainContractCode,MainContract.MainContractName,MainContract.VersionNo,(CASE MainContract.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,MainContract.MainContractContents,MainContract.CompileMan,Users.PersonName AS CompileManName, MainContract.CompileDate,MainContract.States"
string strSql = "SELECT MainContract.MainContractId,MainContract.ProjectId,MainContractCode,MainContract.MainContractName,MainContract.VersionNo,(CASE MainContract.ProjectType WHEN '1' THEN 'EPC' WHEN '2' THEN 'EPCM' WHEN '3' THEN 'C' WHEN '4' THEN '其他' END ) AS ProjectType,MainContract.MainContractContents,MainContract.CompileMan, MainContract.CompileDate,MainContract.States"
+ @" FROM ActionPlan_MainContract AS MainContract "
+ @" LEFT JOIN Base_Project AS Project ON MainContract.ProjectId=Project.ProjectId "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON MainContract.MainContractId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId=OperateUser.PersonId "
+ @" LEFT JOIN Person_Persons AS Users ON Users.PersonId = MainContract.CompileMan "
+ @" WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue != BLL.Const._Null)
@@ -344,7 +342,7 @@ namespace FineUIPro.Web.ZHGL.Plan
Model.ActionPlan_MainContract MainContract = MainContractService.GetMainContractById(id);
if (MainContract != null)
{
string projectName = BLL.ProjectService.GetProjectNameByProjectId(MainContract.ProjectId);
string projectName = MainContract.ProjectId;
newUrl = uploadfilepath.Replace(".xlsx", MainContract.MainContractCode + "(" + MainContract.MainContractName + ")" + ".xlsx");
File.Copy(uploadfilepath, newUrl);
// 第一步:读取文件流