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

bug修改

Browse Source
This commit is contained in:
guo 2024-01-22 14:17:04 +08:00
parent 065c193ac1
commit c6bfeddb02
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java
View File

@ -114,16 +114,16 @@ public class FrontierProtectionNoNetData implements Serializable {
* 操作人id * 操作人id
*/ */
@Excel(name = "操作人id", width = 15) @Excel(name = "操作人id", width = 15)
@ApiModelProperty(value = "操作人id") @ApiModelProperty(value = "操作人id")
private java.lang.Integer operateId; private java.lang.Long operateId;
/** /**
* 操作时间 * 操作时间
*/ */
@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "操作时间") @ApiModelProperty(value = "操作时间")
private java.util.Date operateTime; private java.util.Date operateTime;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "设备名称") @ApiModelProperty(value = "设备名称")

1
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml
View File

@ -5,6 +5,7 @@
resultType="com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData"> resultType="com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData">
select fpnnd.*,fpd.location,fpd.dev_name from frontier_protection_no_net_data fpnnd select fpnnd.*,fpd.location,fpd.dev_name from frontier_protection_no_net_data fpnnd
join frontier_protection_dev fpd on fpd.dev_sn=fpnnd.dev_sn join frontier_protection_dev fpd on fpd.dev_sn=fpnnd.dev_sn
left join system_user su on su.user_id=fpnnd.operate_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

8
src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java
View File

@ -8,6 +8,8 @@ import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNo
import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper; import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper;
import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper; import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper;
import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService; import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -73,6 +76,11 @@ public class FrontierProtectionNoNetDataServiceImpl extends ServiceImpl<Frontier
@Override @Override
public void edit(FrontierProtectionNoNetData frontierProtectionNoNetData) { public void edit(FrontierProtectionNoNetData frontierProtectionNoNetData) {
if (Objects.equals(frontierProtectionNoNetData.getHandleDone(), 1)) {
UserInfo userInfo = SecurityUtils.getUser();
frontierProtectionNoNetData.setOperateId(userInfo.getUserId());
frontierProtectionNoNetData.setOperateTime(new Date());
}
baseMapper.updateById(frontierProtectionNoNetData); baseMapper.updateById(frontierProtectionNoNetData);
} }