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

BUG调整：计划、总结施工人员汇总显示不对；复制预览格式调整；支出明细-支出查询增加合计；支出明细-支出查询执行人查询条件BUG修改。

This commit is contained in:
曹磊 2024-04-01 11:01:27 +08:00
parent d28690ed3c
commit e0a9af96b7
7 changed files with 91 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java
View File

@ -114,6 +114,17 @@ public class BusinessZcmxController {
return R.ok().put("page", page);
}
/**
* 列表-支出查询合计
*/
@RequestMapping("/zccxhj")
@RequiresPermissions("business:businesszcmx:list")
public R zccxhj(@RequestParam Map<String, Object> params){
Map<String, Object> page = businessOutlayService.getZccxhj(params);
return R.ok().put("page", page);
}
/**
* 列表-支出查询
*/

7
src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java
View File

@ -132,4 +132,11 @@ public interface BusinessOutlayDao extends BaseMapper<BusinessOutlayEntity> {
* @return
*/
List<Map<String,Object>> yzList(Map<String, Object> params);
/**
* 列表-支出查询合计
*/
Map<String,Object> getZccxhj(Map<String, Object> params);
}

6
src/main/java/io/renren/modules/business/service/BusinessOutlayService.java
View File

@ -60,6 +60,7 @@ public interface BusinessOutlayService extends IService<BusinessOutlayEntity> {
*/
Map<String, Object> getLatestTime() throws ParseException;
/**
* 为了传入到 年度总结
* @param outTime
@ -98,5 +99,10 @@ public interface BusinessOutlayService extends IService<BusinessOutlayEntity> {
*/
List<Map<String,Object>> yzList(Map<String, Object> params);
/**
* 列表-支出查询合计
*/
Map<String, Object> getZccxhj(Map<String, Object> params);
}

8
src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java
View File

@ -441,4 +441,12 @@ public class BusinessOutlayServiceImpl extends ServiceImpl<BusinessOutlayDao, Bu
return baseMapper.yzList(params);
}
/**
* 列表-支出查询合计
*/
@Override
public Map<String, Object> getZccxhj(Map<String, Object> params){
return baseMapper.getZccxhj(params);
}
}

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

@ -221,9 +221,12 @@ public class BusinessPlanServiceImpl extends ServiceImpl<BusinessPlanDao, Busine
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";
+ "3.内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "4.材料、机械及工具：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
+ "5.自检总结：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
}
} else {
// copy += "\t\t暂无立项信息\n暂无合同信息\n\n";

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

@ -120,10 +120,14 @@ public class BusinessTotalServiceImpl extends ServiceImpl<BusinessTotalDao, Busi
// + "5.施工内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "6.材料：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
// + "7.机械：" +(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 +="\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";
+ "3.内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "4.材料、机械及工具：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
+ "5.自检总结：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
}
} else {

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

@ -59,14 +59,11 @@
concat(',',b.project_gclb_id,',') like '%,${item},%'
</foreach>
</if>
<if test="start != '' and start != null and start != 'undefined'">
and a.out_time >= #{start}
<if test="startTime != '' and startTime != null and startTime != 'undefined'">
and a.out_time >= #{startTime}
</if>
<if test="end != '' and end != null and end != 'undefined'">
and a.out_time &lt;= #{end}
</if>
<if test="startTime != '' and startTime != null and startTime != 'undefined' and endTime != '' and endTime != null and endTime != 'undefined'">
and date_format(a.out_time, '%Y-%m-%d') between #{startTime} and #{endTime}
<if test="endTime != '' and endTime != null and endTime != 'undefined'">
and a.out_time &lt;= #{endTime}
</if>
<if test="gjz != '' and gjz != null and gjz != 'undefined'">
and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{gjz},'%') or a.out_money like CONCAT('%',#{gjz},'%') or a.out_nr like CONCAT('%',#{gjz},'%') or
@ -831,4 +828,48 @@
group by outin_date
order by outin_date
</select>
<select id="getZccxhj" parameterType="io.renren.modules.business.entity.BusinessOutlayEntity" resultType="map">
select ifnull(sum(a.out_money),0) as zccxhj
from (select * from business_outlay where status = 0 order by out_time desc) a
left JOIN business_project b on a.out_project = b.project_id
left join business_dict c on a.out_way = c.dict_id
left join business_dict d on a.out_type = d.dict_id
left join business_dict e on a.out_payee = e.dict_id
<where>
<if test="outTime != '' and outTime != null and outTime != 'undefined'">
and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{outTime},'%')
</if>
<if test="nowYear != '' and nowYear != null and nowYear != 'undefined'">
and date_format(a.out_time, '%Y') like CONCAT('%',#{nowYear},'%')
</if>
<if test="jsdwId != '' and jsdwId != null and jsdwId != 'undefined'">
and b.project_jsdw_id like CONCAT('%',#{jsdwId},'%')
</if>
<if test="writeUserId != 0 and writeUserId != null and writeUserId != 'undefined' ">
and a.write_user_id = #{writeUserId}
</if>
<if test="gclbId != '' and gclbId != null and gclbId != 'undefined'">
AND
<foreach collection="gclbId.split(',')" index="index" item="item" open="(" separator="OR"
close=")">
concat(',',b.project_gclb_id,',') like '%,${item},%'
</foreach>
</if>
<if test="startTime != '' and startTime != null and startTime != 'undefined'">
and a.out_time >= #{startTime}
</if>
<if test="endTime != '' and endTime != null and endTime != 'undefined'">
and a.out_time &lt;= #{endTime}
</if>
<if test="gjz != '' and gjz != null and gjz != 'undefined'">
and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{gjz},'%') or a.out_money like CONCAT('%',#{gjz},'%') or a.out_nr like CONCAT('%',#{gjz},'%') or
c.name like CONCAT('%',#{gjz},'%') or d.name like CONCAT('%',#{gjz},'%') or b.project like CONCAT('%',#{gjz},'%') or
b.project_new_name like CONCAT('%',#{gjz},'%') or a.out_payee like CONCAT('%',#{gjz},'%') or e.name like CONCAT('%',#{gjz},'%') or
a.out_payee_address like CONCAT('%',#{gjz},'%') or a.out_payee_phone like CONCAT('%',#{gjz},'%') or a.out_remark like CONCAT('%',#{gjz},'%'))
</if>
</where>
order by a.out_time desc
</select>
</mapper>