yangjun
/
yhjz_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同跟踪、合同管理-立项导入、PC端支出导出都调整

This commit is contained in:
曹磊 2024-05-28 14:49:16 +08:00
parent 466c71aba1
commit e24bbde6c9
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/renren/modules/business/controller/BusinessOutlayController.java
View File

@ -344,8 +344,11 @@ public class BusinessOutlayController {
*/
@RequestMapping("/export")
public void export(HttpServletResponse response, HttpServletRequest request){
String start = request.getParameter("start");
String end = request.getParameter("end");
Map<String, Object> params = new HashMap<>();
//params.put("writeUserId",getUserId());
params.put("start",start);
params.put("end",end);
List<BusinessOutlayEntity> list = businessOutlayService.pcListNoPage(params);
ExcelUtil<BusinessOutlayEntity> util = new ExcelUtil<BusinessOutlayEntity>(BusinessOutlayEntity.class);
R r = util.exportExcel(list, "支出明细");

4
src/main/java/io/renren/modules/business/controller/BusinessOutlayIncomeController.java
View File

@ -211,8 +211,12 @@ public class BusinessOutlayIncomeController {
*/
@RequestMapping("/export")
public void export(HttpServletResponse response, HttpServletRequest request){
String start = request.getParameter("start");
String end = request.getParameter("end");
Map<String, Object> params = new HashMap<>();
params.put("writeUserId",getUserId());
params.put("start",start);
params.put("end",end);
List<BusinessOutlayIncomeEntity> list = businessOutlayIncomeService.pcListNoPage(params);
ExcelUtil<BusinessOutlayIncomeEntity> util = new ExcelUtil<BusinessOutlayIncomeEntity>(BusinessOutlayIncomeEntity.class);
R r = util.exportExcel(list, "收支总结");

11
src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java
View File

@ -163,7 +163,8 @@ public class BusinessPlanServiceImpl extends ServiceImpl<BusinessPlanDao, Busine
//ids 字符串查询合同用
String ids = "";
//copy字符串返回到前端为了 使用一键复制功能
String copy = "时间:" + time;
String copy = "明日计划";
copy +="\n\n" + "时间:" + time;
//遍历 获取立项ids
if (list.size() > 0) {
for (BusinessPlanEntity i : list) {
@ -216,17 +217,15 @@ public class BusinessPlanServiceImpl extends ServiceImpl<BusinessPlanDao, Busine
// + "7.机械：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
for (BusinessProjectEntity i : projectList) { // 里面的立项信息
if (j.getPlanProjectId().equals(i.getProjectId())) { // 判断当前立项是不是选中的立项
System.out.println(j);
System.out.println(i);
copy +="\n\n" + "立项名称：" + (i.getProjectNewName() != null ? i.getProjectNewName() : i.getProject()) + "\n";
}
}
// copy += "\r" + "1.是否一天：" + j.getOneDay() + "\n" + "2.施工人员：" + (j.getSelectPer() != null?j.getSelectPer():"暂无") + "\n"
// + "3.施工内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "4.材料：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
// + "5.机械：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
copy += "\r" + "1.是否一天：" + j.getOneDay() + "\n" + "2.施工人员：" + (j.getSelectPer() != null?j.getSelectPer():"暂无") + "\n"
+ "3.内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "4.材料、机械及工具：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
+ "5.自检总结：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
copy += "\r" + "①.是否一天：" + j.getOneDay() + "\n" + "②.施工人员：" + (j.getSelectPer() != null?j.getSelectPer():"暂无") + "\n"
+ "③.预计完成内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "④.材料、机械及工具：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
+ "⑤.自检总结：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
}
} else {
// copy += "\t\t暂无立项信息\n暂无合同信息\n\n";

9
src/main/java/io/renren/modules/business/service/impl/BusinessTotalServiceImpl.java
View File

@ -75,7 +75,8 @@ public class BusinessTotalServiceImpl extends ServiceImpl<BusinessTotalDao, Busi
//ids 字符串查询合同用
String ids = "";
//copy字符串返回到前端为了 使用一键复制功能
String copy = "时间:" + time;
String copy = "今日总结";
copy +="\n\n" + "时间:" + time;
//遍历 获取立项ids
if (list.size() > 0) {
for (BusinessTotalEntity i : list) {
@ -125,9 +126,9 @@ public class BusinessTotalServiceImpl extends ServiceImpl<BusinessTotalDao, Busi
// + "3.施工内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "4.材料：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
// + "5.机械：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
copy +="\n\n" + "立项名称：" + (i.getProjectNewName() != null ? i.getProjectNewName() : i.getProject()) + "\n";
copy += "\r" + "1.是否一天：" + i.getOneDay() + "\n" + "2.施工人员：" + (i.getSelectPer() != null?i.getSelectPer():"暂无") + "\n"
+ "3.内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "4.材料、机械及工具：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
+ "5.自检总结：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
copy += "\r" + "①.是否一天：" + i.getOneDay() + "\n" + "②.施工人员：" + (i.getSelectPer() != null?i.getSelectPer():"暂无") + "\n"
+ "③.完成内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "④.材料、机械及工具：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
+ "⑤.自检总结：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
}
} else {

2
src/main/resources/mapper/business/BusinessOutlayDao.xml
View File

@ -741,7 +741,7 @@
close=")">
out_project = #{item}
</foreach>
GROUP BY out_type
GROUP BY out_project,out_type
) t
GROUP BY out_project) a
RIGHT Join (SELECT * FROM business_project WHERE

3
src/main/resources/mapper/business/BusinessProjectDao.xml
View File

@ -78,6 +78,9 @@
LEFT JOIN business_worker g on a.project_lly_id = g.user_id
LEFT JOIN (select distinct total_project_id,select_persion_id from business_total) gr on a.project_id = gr.total_project_id
<where>
<if test="projectJsdwId != null and projectJsdwId != '' and projectJsdwId != 'undefined'">
and FIND_IN_SET(a.project_id,(select GROUP_CONCAT(project_id) FROM business_contract where contract_jsdw_id = #{projectJsdwId})) = 0
</if>
<if test="gjz != null and gjz != '' and gjz != 'undefined'">
and (
a.project like CONCAT('%',#{gjz},'%') or a.project_new_name like CONCAT('%',#{gjz},'%') or