admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-10-28 19:35:47 +08:00
parent 5b1c38f72d
commit d768e6304d
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/baotou/controller/ConstructionPlanLedgerController.java
View File

@ -151,6 +151,9 @@ public class ConstructionPlanLedgerController {
@PostMapping(value = "/downloadPicInfo")
public Result downloadPicInfo(@RequestBody Map<String, Object> param) throws IOException {
String ids = MapUtils.getString(param, "ids");
if (StrUtil.isBlank(ids)) {
return Result.ok();
}
List<ConstructionPlanLedger> list = constructionPlanLedgerService.list(new LambdaQueryWrapper<ConstructionPlanLedger>().in(ConstructionPlanLedger::getId, StrUtil.split(ids, ",")));
if (CollUtil.isEmpty(list)) {
return Result.ok();

6
src/main/java/com/zhgd/xmgl/modules/baotou/entity/PartyBuildingGuidance.java
View File

@ -40,9 +40,9 @@ public class PartyBuildingGuidance implements Serializable {
@Excel(name = "图片/视频", width = 15)
@ApiModelProperty(value="图片/视频")
private java.lang.String file ;
/**类型：1:宣传报道;2:专题活动;3:学习园地;4:党建共建活动纪实;5:党建共建方案;6:党建共建协议;7:党建品牌;8:党员示范岗;9:先锋模范;10:攻坚小组;*/
@Excel(name = "类型：1:宣传报道;2:专题活动;3:学习园地;4:党建共建活动纪实;5:党建共建方案;6:党建共建协议;7:党建品牌;8:党员示范岗;9:先锋模范;10:攻坚小组;", width = 15)
@ApiModelProperty(value="类型：1:宣传报道;2:专题活动;3:学习园地;4:党建共建活动纪实;5:党建共建方案;6:党建共建协议;7:党建品牌;8:党员示范岗;9:先锋模范;10:攻坚小组;")
/**类型：1:宣传报道;2:专题活动;3:学习园地;4:党建共建活动纪实;5:党建共建方案;6:党建共建协议;7:党建品牌;8:党员示范岗;9:先锋模范;10:攻坚小组;11:首件样板;*/
@Excel(name = "类型：1:宣传报道;2:专题活动;3:学习园地;4:党建共建活动纪实;5:党建共建方案;6:党建共建协议;7:党建品牌;8:党员示范岗;9:先锋模范;10:攻坚小组;11:首件样板;", width = 15)
@ApiModelProperty(value="类型：1:宣传报道;2:专题活动;3:学习园地;4:党建共建活动纪实;5:党建共建方案;6:党建共建协议;7:党建品牌;8:党员示范岗;9:先锋模范;10:攻坚小组;11:首件样板;")
private java.lang.Integer type ;
/**所属项目SN*/
@Excel(name = "所属项目SN", width = 15)

1
src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java
View File

@ -72,6 +72,7 @@ public class AiAnalyseHardWareAlarmRecordController {
@ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "handleDone", value = "1处置过", paramType = "body", required = false, dataType = "Boolean"),
@ApiImplicitParam(name = "isPushed", value = "1推送给承包商", paramType = "body", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "selectType", value = "查询类型，1近七天，2最近30天，3今日，4、24小时", paramType = "body", required = false, dataType = "String"),
})
@PostMapping(value = "/selectPageList")
public Result<IPage<AiAnalyseHardWareAlarmRecord>> queryPageList(@RequestBody Map<String, Object> map) {

14
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
View File

@ -89,6 +89,18 @@
<if test="param.hardwareName != null and param.hardwareName != ''">
and h.hardware_name like CONCAT(CONCAT('%', #{param.hardwareName}), '%')
</if>
<if test="param.selectType == '2'.toString()">
and a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -29 DAY), '%Y-%m-%d'), ' 00:00:00')
</if>
<if test="param.selectType == '1'.toString()">
and a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
</if>
<if test="param.selectType == '3'.toString()">
and a.create_time >= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
</if>
<if test="param.selectType == '4'.toString()">
and a.create_time >= DATE_ADD(NOW(), INTERVAL -1 DAY)
</if>
group by a.id
order by a.create_time desc
</select>
@ -140,7 +152,7 @@
</select>
<sql id="queryAlarmTime">
<if test="selectType == '2'.toString()">
and a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -30 DAY), '%Y-%m-%d'), ' 00:00:00')
and a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -29 DAY), '%Y-%m-%d'), ' 00:00:00')
</if>
<if test="selectType == '1'.toString()">
and a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -50,7 +50,7 @@
</if>
WHERE 1 = 1
<if test="param.postWorkTypeName != null and param.postWorkTypeName != ''">
or (c.department_name like CONCAT(CONCAT('%',#{param.postWorkTypeName}),'%') and wt.type_name like CONCAT(CONCAT('%',#{param.postWorkTypeName}),'%'))
and (c.department_name like CONCAT(CONCAT('%',#{param.postWorkTypeName}),'%') or wt.type_name like CONCAT(CONCAT('%',#{param.postWorkTypeName}),'%'))
</if>
<if test="param.safeScoreLevel == '1'.toString()">
and a.safe_score &lt; #{param.workerInfoRedScore}