mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat 收入明细表: 

1:产品大类修改为字符串
dev_1.0.0
chenhao 2024-10-31 14:06:26 +08:00
parent 07a6165c2a
commit 45721a3d84
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -9,6 +9,7 @@ import cn.palmte.work.utils.excel.ExcelLogs;
import cn.palmte.work.utils.excel.ExcelUtil; import cn.palmte.work.utils.excel.ExcelUtil;
import cn.palmte.work.utils.excel.ExportExcelUtils; import cn.palmte.work.utils.excel.ExportExcelUtils;
import cn.palmte.work.utils.excel.ExportUtils; import cn.palmte.work.utils.excel.ExportUtils;
import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -18,6 +19,7 @@ import org.activiti.engine.task.Task;
import org.apache.poi.EncryptedDocumentException; import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.poifs.filesystem.OfficeXmlFileException; import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
import org.apache.poi.util.StringUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -549,27 +551,32 @@ public class ProjectController extends BaseController {
List<ProjectBudgetCostProjectManageDetailTemp> detailList = new ArrayList<>(details.size()); List<ProjectBudgetCostProjectManageDetailTemp> detailList = new ArrayList<>(details.size());
for (int i = 0; i < details.size(); i++) { for (int i = 0; i < details.size(); i++) {
ProjectBudgetCostProjectManageDetailTemp detail = details.getObject(i, ProjectBudgetCostProjectManageDetailTemp.class); ProjectBudgetCostProjectManageDetailTemp detail = details.getObject(i, ProjectBudgetCostProjectManageDetailTemp.class);
if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) { if (!StringUtils.isEmpty(detail.getName()) && detail.getName().length()>1){
detail.setName(detail.getName2());
detail.setIsDiy(1); detail.setIsDiy(1);
} else { }else{
if ("1".equals(detail.getName1())) {
detail.setName("人工费");
} else if ("2".equals(detail.getName1())) {
detail.setName("总部支撑人力费用");
} else if ("4".equals(detail.getName1())) {
detail.setName("人员差旅费");
} else if ("5".equals(detail.getName1())) {
detail.setName("业务费用");
} else if ("6".equals(detail.getName1())) {
detail.setName("商务及专项验收费用");
} else if ("7".equals(detail.getName1())) {
detail.setName("办公费用");
} else if ("9".equals(detail.getName1())) {
detail.setName("保证金");
}
detail.setIsDiy(0); detail.setIsDiy(0);
} }
// if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) {
// // detail.setName(detail.getName2());
// detail.setIsDiy(1);
// } else {
// if ("1".equals(detail.getName1())) {
// detail.setName("人工费");
// } else if ("2".equals(detail.getName1())) {
// detail.setName("总部支撑人力费用");
// } else if ("4".equals(detail.getName1())) {
// detail.setName("人员差旅费");
// } else if ("5".equals(detail.getName1())) {
// detail.setName("业务费用");
// } else if ("6".equals(detail.getName1())) {
// detail.setName("商务及专项验收费用");
// } else if ("7".equals(detail.getName1())) {
// detail.setName("办公费用");
// } else if ("9".equals(detail.getName1())) {
// detail.setName("保证金");
// }
// detail.setIsDiy(0);
// }
detailList.add(detail); detailList.add(detail);
} }