diff --git a/src/main/java/cn/palmte/work/service/ActTaskDefService.java b/src/main/java/cn/palmte/work/service/ActTaskDefService.java index 375153b..cad28bb 100644 --- a/src/main/java/cn/palmte/work/service/ActTaskDefService.java +++ b/src/main/java/cn/palmte/work/service/ActTaskDefService.java @@ -94,11 +94,11 @@ public class ActTaskDefService { * @param comment */ public void completeTaskByProcInsId(String procInsId, int type, String comment) { - int adminId = InterfaceUtil.getAdminId(); + //int adminId = InterfaceUtil.getAdminId(); List taskList = taskService.createTaskQuery().processInstanceId(procInsId).list(); - List assignUserList; + //List assignUserList; for (Task task : taskList) { - assignUserList = actUtil.getAssignUserList(task.getId()); + //assignUserList = actUtil.getAssignUserList(task.getId()); //if (assignUserList.contains(String.valueOf(adminId))) { completeTask(task.getId(), procInsId, comment, type); //} diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 1b424ad..1b682cf 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -779,20 +779,7 @@ public class ProjectBudgetService { } public void budgetApprove(Integer approveStatusBudget, Project projectInDb, Admin admin) throws Exception { - - if(null != approveStatusBudget && - ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusBudget){ - //审核不通过的情况下重新编辑后就完成当前任务 - List budgetProcessInsIds = projectInstanceService.getBudgetProcessInsIds(projectInDb); - if(CollectionUtil.isNotEmpty(budgetProcessInsIds)){ - actTaskDefService.completeTaskByProcInsId(budgetProcessInsIds.get(0), - ApproveStatusEnum.APPROVAL_PASSED.getApproveStatus(), - "重新修改了预算表，请审批"); - } - }else { - //第一次或者重新发起一个流程实例 - projectInstanceService.startBudgetProcessInstance(projectInDb, admin); - } + projectInstanceService.startBudgetProcessInstance(projectInDb, admin); } /** diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 61f460c..0c24a1d 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -297,40 +297,29 @@ public class ProjectEstimateService { } public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) throws Exception { - if(null != approveStatusEstimate && - ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusEstimate){ - //审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个，也就是发起审批】 - List estimateProcessInsIds = projectInstanceService.getEstimateProcessInsIds(projectInDb); - if(CollectionUtil.isNotEmpty(estimateProcessInsIds)){ - actTaskDefService.completeTaskByProcInsId(estimateProcessInsIds.get(0), - ApproveStatusEnum.APPROVAL_PASSED.getApproveStatus(), - "重新修改了概算表，请审批"); - } - }else { - //第一次或者重新发起一个流程实例【第一次或者以前的审批都已经过了】 - projectInstanceService.startEstimateProcessInstance(projectInDb, admin); - int type = projectInDb.getType(); - List userIds = new ArrayList<>(); - if (type == 1) { - String sql = "select sur.user_id from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_deleted = 0 and sur.is_deleted = 0 and sr.level in (1,2,3,4,5,6)"; - userIds = pagination.find(sql, SysUserRole.class); - } else if (type == 2) { - String sql = "select sur.user_id from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_deleted = 0 and sur.is_deleted = 0 and sr.level in (1,2,3,5,6)"; - userIds = pagination.find(sql, SysUserRole.class); - } else if (type == 3) { - String sql = "select sur.user_id from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_deleted = 0 and sur.is_deleted = 0 and sr.level in (1,2,3,6)"; - userIds = pagination.find(sql, SysUserRole.class); - } - List pvs = new ArrayList<>(); - for (SysUserRole sysUserRole : userIds) { - ProjectVisible pv = new ProjectVisible(); - pv.setProjectId(projectInDb.getId()); - pv.setType(2); - pv.setTid(sysUserRole.getUserId()); - pvs.add(pv); - } - projectVisibleRepository.save(pvs); + projectInstanceService.startEstimateProcessInstance(projectInDb, admin); + int type = projectInDb.getType(); + List userIds = new ArrayList<>(); + if (type == 1) { + String sql = "select sur.user_id from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_deleted = 0 and sur.is_deleted = 0 and sr.level in (1,2,3,4,5,6)"; + userIds = pagination.find(sql, SysUserRole.class); + } else if (type == 2) { + String sql = "select sur.user_id from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_deleted = 0 and sur.is_deleted = 0 and sr.level in (1,2,3,5,6)"; + userIds = pagination.find(sql, SysUserRole.class); + } else if (type == 3) { + String sql = "select sur.user_id from sys_role sr left join sys_user_role sur on sr.id = sur.role_id where sr.is_deleted = 0 and sur.is_deleted = 0 and sr.level in (1,2,3,6)"; + userIds = pagination.find(sql, SysUserRole.class); } + List pvs = new ArrayList<>(); + for (SysUserRole sysUserRole : userIds) { + ProjectVisible pv = new ProjectVisible(); + pv.setProjectId(projectInDb.getId()); + pv.setType(2); + pv.setTid(sysUserRole.getUserId()); + pvs.add(pv); + } + projectVisibleRepository.save(pvs); + } /** diff --git a/src/main/resources/static/assets/css/admin.css b/src/main/resources/static/assets/css/admin.css index 5e4d687..22e7884 100644 --- a/src/main/resources/static/assets/css/admin.css +++ b/src/main/resources/static/assets/css/admin.css @@ -404,4 +404,10 @@ textarea{ } select{ font-size: 1.48vh !important; +} +option{ + font-size: 1.48vh !important; +} +div{ + font-size: 1.48vh !important; } \ No newline at end of file diff --git a/src/main/resources/templates/admin/month_statistics.ftl b/src/main/resources/templates/admin/month_statistics.ftl index d280d10..51f7c9b 100644 --- a/src/main/resources/templates/admin/month_statistics.ftl +++ b/src/main/resources/templates/admin/month_statistics.ftl @@ -9,9 +9,11 @@ border-bottom: 1px solid; border-right: 1px solid; } + .cal-table-left { display: inline-block; } + table { display: block; border-collapse: collapse; @@ -35,12 +37,219 @@
  • 现金流量表
    • -
    -
    - - <#if (primaryIndicatorList)?exists && (primaryIndicatorList?size>0)><#list primaryIndicatorList as list> -
    类别收入--设备类收入--施工类收入--服务类采购成本--设备类采购成本--施工类采购成本--服务类采购成本--其他成本--其他成本--项目管理成本财务费用--资金占用成本公司管理费用
    ${list.title!}${(list.incomeDevice!0)?string("#,##0.##")}${(list.incomeEngineer!0)?string("#,##0.##")}${(list.incomeService!0)?string("#,##0.##")}${(list.costPurchaseDevice!0)?string("#,##0.##")}${(list.costPurchaseBuild!0)?string("#,##0.##")}${(list.costPurchaseService!0)?string("#,##0.##")}${(list.costPurchaseOther!0)?string("#,##0.##")}${(list.costOtherOther!0)?string("#,##0.##")}${(list.costProjectManage!0)?string("#,##0.##")}${(list.costExpropriation!0)?string("#,##0.##")}${(list.costCompanyManage!0)?string("#,##0.##")}
    +
    +
    +
    +
    类别
    +
    +
    +
    + <#if (primaryIndicatorList)?exists && (primaryIndicatorList?size>0)><#list primaryIndicatorList as list> +
    +
    +
    + ${list.title!} +
    +
    +
    + +
    +
    +
    +
    +
    +<#--
    类别
    --> +
    +
    收入--设备类
    +
    收入--施工类
    +
    收入--服务类
    +
    采购成本--设备类
    +
    采购成本--施工类
    +
    采购成本--服务类
    +
    采购成本--其他
    +
    成本--其他
    +
    成本--项目管理成本
    +
    财务费用--资金占用成本
    +
    公司管理费用
    +
    +
    +
    +<#--
    --> +<#-- <#if (primaryIndicatorList)?exists && (primaryIndicatorList?size>0)><#list primaryIndicatorList as list>--> +<#--
    --> +<#--
    --> +<#--
    --> +<#-- ${list.title!}--> +<#--
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#--
    --> +
    + <#if (primaryIndicatorList)?exists && (primaryIndicatorList?size>0)><#list primaryIndicatorList as list> +
    +
    +
    ${(list.incomeDevice!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.incomeEngineer!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.incomeService!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costPurchaseDevice!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costPurchaseBuild!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costPurchaseService!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costPurchaseOther!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costOtherOther!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costProjectManage!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costExpropriation!0)?string("#,##0.##")}
    +
    +
    +
    ${(list.costCompanyManage!0)?string("#,##0.##")}
    +
    +
    + +
    +
    + +
    + +<#--
    --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- +<#-- style="overflow-x: scroll;width: calc(100% - 180px);white-space: nowrap;"><#if (primaryIndicatorList)?exists && (primaryIndicatorList?size>0)><#list primaryIndicatorList as list>--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
    类别收入--设备类收入--施工类收入--服务类采购成本--设备类采购成本--施工类采购成本--服务类采购成本--其他成本--其他成本--项目管理成本财务费用--资金占用成本 +<#-- class="cal-table-column">公司管理费用--> +<#--
    ${list.title!}${(list.incomeDevice!0)?string("#,##0.##")}${(list.incomeEngineer!0)?string("#,##0.##")}${(list.incomeService!0)?string("#,##0.##")}${(list.costPurchaseDevice!0)?string("#,##0.##")}${(list.costPurchaseBuild!0)?string("#,##0.##")}${(list.costPurchaseService!0)?string("#,##0.##")}${(list.costPurchaseOther!0)?string("#,##0.##")}${(list.costOtherOther!0)?string("#,##0.##")}${(list.costProjectManage!0)?string("#,##0.##")}${(list.costExpropriation!0)?string("#,##0.##")}${(list.costCompanyManage!0)?string("#,##0.##")}
    --> +<#--
    -->
    @@ -48,9 +257,46 @@
    - - <#if (profitAndLossList)?exists && (profitAndLossList?size>0)><#list profitAndLossList as list> -
    /营业收入营业成本项目管理成本其他财务费用项目毛利项目毛利率公司管理费用项目贡献利润项目贡献利润率所得税费用项目净利润项目净利润率
    ${list.title!}${(list.income!0)?string("#,##0.##")}${(list.cost!0)?string("#,##0.##")}${(list.manageCost!0)?string("#,##0.##")}${(list.other!0)?string("#,##0.##")}${(list.expropriation!0)?string("#,##0.##")}${(list.grossProfit!0)?string("#,##0.##")}${(list.grossProfitProfit!0)?string("#,##0.##")}${(list.companyManage!0)?string("#,##0.##")}${(list.contributionMargin!0)?string("#,##0.##")}${(list.contributionMarginProfit!0)?string("#,##0.##")}${(list.incomeTax!0)?string("#,##0.##")}${(list.netMargin!0)?string("#,##0.##")}${(list.netMarginProfit!0)?string("#,##0.##")}
    + + + + + + + + + + + + + + + + + + + + <#if (profitAndLossList)?exists && (profitAndLossList?size>0)><#list profitAndLossList as list> + + + + + + + + + + + + + + + + +
    /营业收入营业成本项目管理成本其他财务费用项目毛利项目毛利率公司管理费用项目贡献利润项目贡献利润率所得税费用项目净利润项目净利润率 +
    ${list.title!}${(list.income!0)?string("#,##0.##")}${(list.cost!0)?string("#,##0.##")}${(list.manageCost!0)?string("#,##0.##")}${(list.other!0)?string("#,##0.##")}${(list.expropriation!0)?string("#,##0.##")}${(list.grossProfit!0)?string("#,##0.##")}${(list.grossProfitProfit!0)?string("#,##0.##")}${(list.companyManage!0)?string("#,##0.##")}${(list.contributionMargin!0)?string("#,##0.##")}${(list.contributionMarginProfit!0)?string("#,##0.##")}${(list.incomeTax!0)?string("#,##0.##")}${(list.netMargin!0)?string("#,##0.##")}${(list.netMarginProfit!0)?string("#,##0.##")}
    @@ -58,9 +304,48 @@
    - - <#if (cashFlowList)?exists && (cashFlowList?size>0)><#list cashFlowList as list> -
    /销售商品、提供劳务收到的现金收到的税费返还收到其他与经营活动有关的现金购买商品、接受劳务支付的现金支付的各项税费支付其他与经营活动有关的现金经营活动产生的现金流量净额投资活动现金流入投资活动现金流出投资活动产生的现金流量净额借款资金流入还款资金流出筹资活动产生的现金流量净额货币资金净增加额
    ${list.title!}${(list.saleIncomeCash!0)?string("#,##0.##")}${(list.taxReturn!0)?string("#,##0.##")}${(list.earnestMoneyIncome!0)?string("#,##0.##")}${(list.purchaseCost!0)?string("#,##0.##")}${(list.taxCost!0)?string("#,##0.##")}${(list.earnestMoneyCost!0)?string("#,##0.##")}${(list.netCashFlow!0)?string("#,##0.##")}${(list.cashInflowFromInvestingActivities!0)?string("#,##0.##")}${(list.cashOutflowFromInvestingActivities!0)?string("#,##0.##")}${(list.netCashFromInvestingActivities!0)?string("#,##0.##")}${(list.financingCapitalInflow!0)?string("#,##0.##")}${(list.financingCapitalOutflow!0)?string("#,##0.##")}${(list.financingCapitalCashflow!0)?string("#,##0.##")}${(list.netIncreaseMonetaryFunds!0)?string("#,##0.##")}
    + + + + + + + + + + + + + + + + + + + + + <#if (cashFlowList)?exists && (cashFlowList?size>0)><#list cashFlowList as list> + + + + + + + + + + + + + + + + + +
    /销售商品、提供劳务收到的现金收到的税费返还收到其他与经营活动有关的现金购买商品、接受劳务支付的现金支付的各项税费支付其他与经营活动有关的现金经营活动产生的现金流量净额投资活动现金流入投资活动现金流出投资活动产生的现金流量净额借款资金流入还款资金流出筹资活动产生的现金流量净额货币资金净增加额 +
    ${list.title!}${(list.saleIncomeCash!0)?string("#,##0.##")}${(list.taxReturn!0)?string("#,##0.##")}${(list.earnestMoneyIncome!0)?string("#,##0.##")}${(list.purchaseCost!0)?string("#,##0.##")}${(list.taxCost!0)?string("#,##0.##")}${(list.earnestMoneyCost!0)?string("#,##0.##")}${(list.netCashFlow!0)?string("#,##0.##")}${(list.cashInflowFromInvestingActivities!0)?string("#,##0.##")}${(list.cashOutflowFromInvestingActivities!0)?string("#,##0.##")}${(list.netCashFromInvestingActivities!0)?string("#,##0.##")}${(list.financingCapitalInflow!0)?string("#,##0.##")}${(list.financingCapitalOutflow!0)?string("#,##0.##")}${(list.financingCapitalCashflow!0)?string("#,##0.##")}${(list.netIncreaseMonetaryFunds!0)?string("#,##0.##")}
    diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index f1e67b4..9406e4c 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -76,8 +76,8 @@
    *项目类型
    -
    -