Commit d7a2985a authored by xulihui's avatar xulihui

从业人员管理新增详情和变更记录,完成年度行业指标汇总和上报

parent 56f07ae5
package com.zehong.web.controller.supervise;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TEmployedPeopleInfoChangelog;
import com.zehong.system.service.ITEmployedPeopleInfoChangelogService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 从业人员信息变更记录Controller
*
* @author zehong
* @date 2026-03-09
*/
@RestController
@RequestMapping("/system/changelog")
public class TEmployedPeopleInfoChangelogController extends BaseController
{
@Autowired
private ITEmployedPeopleInfoChangelogService tEmployedPeopleInfoChangelogService;
/**
* 查询从业人员信息变更记录列表
*/
@GetMapping("/list")
public TableDataInfo list(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
startPage();
List<TEmployedPeopleInfoChangelog> list = tEmployedPeopleInfoChangelogService.selectTEmployedPeopleInfoChangelogList(tEmployedPeopleInfoChangelog);
return getDataTable(list);
}
/**
* 导出从业人员信息变更记录列表
*/
@Log(title = "从业人员信息变更记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
List<TEmployedPeopleInfoChangelog> list = tEmployedPeopleInfoChangelogService.selectTEmployedPeopleInfoChangelogList(tEmployedPeopleInfoChangelog);
ExcelUtil<TEmployedPeopleInfoChangelog> util = new ExcelUtil<TEmployedPeopleInfoChangelog>(TEmployedPeopleInfoChangelog.class);
return util.exportExcel(list, "从业人员信息变更记录数据");
}
/**
* 获取从业人员信息变更记录详细信息
*/
@GetMapping(value = "/{employedPeopleId}")
public AjaxResult getInfo(@PathVariable("employedPeopleId") Long employedPeopleId)
{
return AjaxResult.success(tEmployedPeopleInfoChangelogService.selectTEmployedPeopleInfoChangelogById(employedPeopleId));
}
/**
* 新增从业人员信息变更记录
*/
@Log(title = "从业人员信息变更记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
return toAjax(tEmployedPeopleInfoChangelogService.insertTEmployedPeopleInfoChangelog(tEmployedPeopleInfoChangelog));
}
/**
* 修改从业人员信息变更记录
*/
@Log(title = "从业人员信息变更记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
return toAjax(tEmployedPeopleInfoChangelogService.updateTEmployedPeopleInfoChangelog(tEmployedPeopleInfoChangelog));
}
/**
* 删除从业人员信息变更记录
*/
@Log(title = "从业人员信息变更记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{employedPeopleIds}")
public AjaxResult remove(@PathVariable Long[] employedPeopleIds)
{
return toAjax(tEmployedPeopleInfoChangelogService.deleteTEmployedPeopleInfoChangelogByIds(employedPeopleIds));
}
}
\ No newline at end of file
package com.zehong.web.controller.supervise;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TStaEnterpriseInfor;
import com.zehong.system.service.ITStaEnterpriseInforService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 年度行业指标汇总-燃气企业基本情况信息Controller
*
* @author zehong
* @date 2026-03-10
*/
@RestController
@RequestMapping("/system/infor")
public class TStaEnterpriseInforController extends BaseController
{
@Autowired
private ITStaEnterpriseInforService tStaEnterpriseInforService;
/**
* 查询年度行业指标汇总-燃气企业基本情况信息列表
*/
@GetMapping("/list")
public TableDataInfo list(TStaEnterpriseInfor tStaEnterpriseInfor)
{
startPage();
List<TStaEnterpriseInfor> list = tStaEnterpriseInforService.selectTStaEnterpriseInforList(tStaEnterpriseInfor);
return getDataTable(list);
}
/**
* 导出年度行业指标汇总-燃气企业基本情况信息列表
*/
@Log(title = "年度行业指标汇总-燃气企业基本情况信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TStaEnterpriseInfor tStaEnterpriseInfor)
{
List<TStaEnterpriseInfor> list = tStaEnterpriseInforService.selectTStaEnterpriseInforList(tStaEnterpriseInfor);
ExcelUtil<TStaEnterpriseInfor> util = new ExcelUtil<TStaEnterpriseInfor>(TStaEnterpriseInfor.class);
return util.exportExcel(list, "年度行业指标汇总-燃气企业基本情况信息数据");
}
/**
* 获取年度行业指标汇总-燃气企业基本情况信息详细信息
*/
@GetMapping(value = "/{fEnterpriseId}")
public AjaxResult getInfo(@PathVariable("fEnterpriseId") Long fEnterpriseId)
{
return AjaxResult.success(tStaEnterpriseInforService.selectTStaEnterpriseInforById(fEnterpriseId));
}
/**
* 新增年度行业指标汇总-燃气企业基本情况信息
*/
@Log(title = "年度行业指标汇总-燃气企业基本情况信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TStaEnterpriseInfor tStaEnterpriseInfor)
{
return toAjax(tStaEnterpriseInforService.insertTStaEnterpriseInfor(tStaEnterpriseInfor));
}
/**
* 修改年度行业指标汇总-燃气企业基本情况信息
*/
@Log(title = "年度行业指标汇总-燃气企业基本情况信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TStaEnterpriseInfor tStaEnterpriseInfor)
{
return toAjax(tStaEnterpriseInforService.updateTStaEnterpriseInfor(tStaEnterpriseInfor));
}
/**
* 删除年度行业指标汇总-燃气企业基本情况信息
*/
@Log(title = "年度行业指标汇总-燃气企业基本情况信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{fEnterpriseIds}")
public AjaxResult remove(@PathVariable Long[] fEnterpriseIds)
{
return toAjax(tStaEnterpriseInforService.deleteTStaEnterpriseInforByIds(fEnterpriseIds));
}
}
\ No newline at end of file
package com.zehong.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 从业人员信息变更记录对象 t_employed_people_info_changelog
*
* @author zehong
* @date 2026-03-10
*/
public class TEmployedPeopleInfoChangelog extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 姓名 */
@Excel(name = "姓名")
private String employedPeopleName;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 变更前 */
@Excel(name = "变更前")
private String beforeChange;
/** 变更后 */
@Excel(name = "变更后")
private String afterChange;
/** 是否删除(0正常,1删除) */
@Excel(name = "是否删除(0正常,1删除)")
private String isDel;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setEmployedPeopleName(String employedPeopleName)
{
this.employedPeopleName = employedPeopleName;
}
public String getEmployedPeopleName()
{
return employedPeopleName;
}
public void setIdCard(String idCard)
{
this.idCard = idCard;
}
public String getIdCard()
{
return idCard;
}
public void setBeforeChange(String beforeChange)
{
this.beforeChange = beforeChange;
}
public String getBeforeChange()
{
return beforeChange;
}
public void setAfterChange(String afterChange)
{
this.afterChange = afterChange;
}
public String getAfterChange()
{
return afterChange;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("employedPeopleName", getEmployedPeopleName())
.append("idCard", getIdCard())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("beforeChange", getBeforeChange())
.append("afterChange", getAfterChange())
.append("isDel", getIsDel())
.append("remarks", getRemarks())
.toString();
}
}
\ No newline at end of file
package com.zehong.system.mapper;
import com.zehong.system.domain.TEmployedPeopleInfoChangelog;
import java.util.List;
/**
* 从业人员信息变更记录Mapper接口
*
* @author zehong
* @date 2026-03-09
*/
public interface TEmployedPeopleInfoChangelogMapper
{
/**
* 查询从业人员信息变更记录
*
* @param employedPeopleId 从业人员信息变更记录ID
* @return 从业人员信息变更记录
*/
public TEmployedPeopleInfoChangelog selectTEmployedPeopleInfoChangelogById(Long employedPeopleId);
/**
* 查询从业人员信息变更记录列表
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 从业人员信息变更记录集合
*/
public List<TEmployedPeopleInfoChangelog> selectTEmployedPeopleInfoChangelogList(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog);
/**
* 新增从业人员信息变更记录
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 结果
*/
public int insertTEmployedPeopleInfoChangelog(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog);
/**
* 修改从业人员信息变更记录
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 结果
*/
public int updateTEmployedPeopleInfoChangelog(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog);
/**
* 删除从业人员信息变更记录
*
* @param employedPeopleId 从业人员信息变更记录ID
* @return 结果
*/
public int deleteTEmployedPeopleInfoChangelogById(Long employedPeopleId);
/**
* 批量删除从业人员信息变更记录
*
* @param employedPeopleIds 需要删除的数据ID
* @return 结果
*/
public int deleteTEmployedPeopleInfoChangelogByIds(Long[] employedPeopleIds);
}
\ No newline at end of file
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TStaEnterpriseInfor;
/**
* 年度行业指标汇总-燃气企业基本情况信息Mapper接口
*
* @author zehong
* @date 2026-03-10
*/
public interface TStaEnterpriseInforMapper
{
/**
* 查询年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseId 年度行业指标汇总-燃气企业基本情况信息ID
* @return 年度行业指标汇总-燃气企业基本情况信息
*/
public TStaEnterpriseInfor selectTStaEnterpriseInforById(Long fEnterpriseId);
/**
* 查询年度行业指标汇总-燃气企业基本情况信息列表
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 年度行业指标汇总-燃气企业基本情况信息集合
*/
public List<TStaEnterpriseInfor> selectTStaEnterpriseInforList(TStaEnterpriseInfor tStaEnterpriseInfor);
/**
* 新增年度行业指标汇总-燃气企业基本情况信息
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 结果
*/
public int insertTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor);
/**
* 修改年度行业指标汇总-燃气企业基本情况信息
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 结果
*/
public int updateTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor);
/**
* 删除年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseId 年度行业指标汇总-燃气企业基本情况信息ID
* @return 结果
*/
public int deleteTStaEnterpriseInforById(Long fEnterpriseId);
/**
* 批量删除年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseIds 需要删除的数据ID
* @return 结果
*/
public int deleteTStaEnterpriseInforByIds(Long[] fEnterpriseIds);
}
\ No newline at end of file
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TEmployedPeopleInfoChangelog;
/**
* 从业人员信息变更记录Service接口
*
* @author zehong
* @date 2026-03-09
*/
public interface ITEmployedPeopleInfoChangelogService
{
/**
* 查询从业人员信息变更记录
*
* @param employedPeopleId 从业人员信息变更记录ID
* @return 从业人员信息变更记录
*/
public TEmployedPeopleInfoChangelog selectTEmployedPeopleInfoChangelogById(Long employedPeopleId);
/**
* 查询从业人员信息变更记录列表
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 从业人员信息变更记录集合
*/
public List<TEmployedPeopleInfoChangelog> selectTEmployedPeopleInfoChangelogList(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog);
/**
* 新增从业人员信息变更记录
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 结果
*/
public int insertTEmployedPeopleInfoChangelog(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog);
/**
* 修改从业人员信息变更记录
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 结果
*/
public int updateTEmployedPeopleInfoChangelog(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog);
/**
* 批量删除从业人员信息变更记录
*
* @param employedPeopleIds 需要删除的从业人员信息变更记录ID
* @return 结果
*/
public int deleteTEmployedPeopleInfoChangelogByIds(Long[] employedPeopleIds);
/**
* 删除从业人员信息变更记录信息
*
* @param employedPeopleId 从业人员信息变更记录ID
* @return 结果
*/
public int deleteTEmployedPeopleInfoChangelogById(Long employedPeopleId);
}
\ No newline at end of file
package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TStaEnterpriseInfor;
/**
* 年度行业指标汇总-燃气企业基本情况信息Service接口
*
* @author zehong
* @date 2026-03-10
*/
public interface ITStaEnterpriseInforService
{
/**
* 查询年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseId 年度行业指标汇总-燃气企业基本情况信息ID
* @return 年度行业指标汇总-燃气企业基本情况信息
*/
public TStaEnterpriseInfor selectTStaEnterpriseInforById(Long fEnterpriseId);
/**
* 查询年度行业指标汇总-燃气企业基本情况信息列表
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 年度行业指标汇总-燃气企业基本情况信息集合
*/
public List<TStaEnterpriseInfor> selectTStaEnterpriseInforList(TStaEnterpriseInfor tStaEnterpriseInfor);
/**
* 新增年度行业指标汇总-燃气企业基本情况信息
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 结果
*/
public int insertTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor);
/**
* 修改年度行业指标汇总-燃气企业基本情况信息
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 结果
*/
public int updateTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor);
/**
* 批量删除年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseIds 需要删除的年度行业指标汇总-燃气企业基本情况信息ID
* @return 结果
*/
public int deleteTStaEnterpriseInforByIds(Long[] fEnterpriseIds);
/**
* 删除年度行业指标汇总-燃气企业基本情况信息信息
*
* @param fEnterpriseId 年度行业指标汇总-燃气企业基本情况信息ID
* @return 结果
*/
public int deleteTStaEnterpriseInforById(Long fEnterpriseId);
}
\ No newline at end of file
package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TEmployedPeopleInfoChangelogMapper;
import com.zehong.system.domain.TEmployedPeopleInfoChangelog;
import com.zehong.system.service.ITEmployedPeopleInfoChangelogService;
/**
* 从业人员信息变更记录Service业务层处理
*
* @author zehong
* @date 2026-03-09
*/
@Service
public class TEmployedPeopleInfoChangelogServiceImpl implements ITEmployedPeopleInfoChangelogService
{
@Autowired
private TEmployedPeopleInfoChangelogMapper tEmployedPeopleInfoChangelogMapper;
/**
* 查询从业人员信息变更记录
*
* @param employedPeopleId 从业人员信息变更记录ID
* @return 从业人员信息变更记录
*/
@Override
public TEmployedPeopleInfoChangelog selectTEmployedPeopleInfoChangelogById(Long employedPeopleId)
{
return tEmployedPeopleInfoChangelogMapper.selectTEmployedPeopleInfoChangelogById(employedPeopleId);
}
/**
* 查询从业人员信息变更记录列表
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 从业人员信息变更记录
*/
@Override
public List<TEmployedPeopleInfoChangelog> selectTEmployedPeopleInfoChangelogList(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
return tEmployedPeopleInfoChangelogMapper.selectTEmployedPeopleInfoChangelogList(tEmployedPeopleInfoChangelog);
}
/**
* 新增从业人员信息变更记录
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 结果
*/
@Override
public int insertTEmployedPeopleInfoChangelog(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
tEmployedPeopleInfoChangelog.setCreateTime(DateUtils.getNowDate());
return tEmployedPeopleInfoChangelogMapper.insertTEmployedPeopleInfoChangelog(tEmployedPeopleInfoChangelog);
}
/**
* 修改从业人员信息变更记录
*
* @param tEmployedPeopleInfoChangelog 从业人员信息变更记录
* @return 结果
*/
@Override
public int updateTEmployedPeopleInfoChangelog(TEmployedPeopleInfoChangelog tEmployedPeopleInfoChangelog)
{
tEmployedPeopleInfoChangelog.setUpdateTime(DateUtils.getNowDate());
return tEmployedPeopleInfoChangelogMapper.updateTEmployedPeopleInfoChangelog(tEmployedPeopleInfoChangelog);
}
/**
* 批量删除从业人员信息变更记录
*
* @param employedPeopleIds 需要删除的从业人员信息变更记录ID
* @return 结果
*/
@Override
public int deleteTEmployedPeopleInfoChangelogByIds(Long[] employedPeopleIds)
{
return tEmployedPeopleInfoChangelogMapper.deleteTEmployedPeopleInfoChangelogByIds(employedPeopleIds);
}
/**
* 删除从业人员信息变更记录信息
*
* @param employedPeopleId 从业人员信息变更记录ID
* @return 结果
*/
@Override
public int deleteTEmployedPeopleInfoChangelogById(Long employedPeopleId)
{
return tEmployedPeopleInfoChangelogMapper.deleteTEmployedPeopleInfoChangelogById(employedPeopleId);
}
}
\ No newline at end of file
package com.zehong.system.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TStaEnterpriseInforMapper;
import com.zehong.system.domain.TStaEnterpriseInfor;
import com.zehong.system.service.ITStaEnterpriseInforService;
/**
* 年度行业指标汇总-燃气企业基本情况信息Service业务层处理
*
* @author zehong
* @date 2026-03-10
*/
@Service
public class TStaEnterpriseInforServiceImpl implements ITStaEnterpriseInforService
{
@Autowired
private TStaEnterpriseInforMapper tStaEnterpriseInforMapper;
/**
* 查询年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseId 年度行业指标汇总-燃气企业基本情况信息ID
* @return 年度行业指标汇总-燃气企业基本情况信息
*/
@Override
public TStaEnterpriseInfor selectTStaEnterpriseInforById(Long fEnterpriseId)
{
return tStaEnterpriseInforMapper.selectTStaEnterpriseInforById(fEnterpriseId);
}
/**
* 查询年度行业指标汇总-燃气企业基本情况信息列表
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 年度行业指标汇总-燃气企业基本情况信息
*/
@Override
public List<TStaEnterpriseInfor> selectTStaEnterpriseInforList(TStaEnterpriseInfor tStaEnterpriseInfor)
{
return tStaEnterpriseInforMapper.selectTStaEnterpriseInforList(tStaEnterpriseInfor);
}
/**
* 新增年度行业指标汇总-燃气企业基本情况信息
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 结果
*/
@Override
public int insertTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor)
{
return tStaEnterpriseInforMapper.insertTStaEnterpriseInfor(tStaEnterpriseInfor);
}
/**
* 修改年度行业指标汇总-燃气企业基本情况信息
*
* @param tStaEnterpriseInfor 年度行业指标汇总-燃气企业基本情况信息
* @return 结果
*/
@Override
public int updateTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor)
{
return tStaEnterpriseInforMapper.updateTStaEnterpriseInfor(tStaEnterpriseInfor);
}
/**
* 批量删除年度行业指标汇总-燃气企业基本情况信息
*
* @param fEnterpriseIds 需要删除的年度行业指标汇总-燃气企业基本情况信息ID
* @return 结果
*/
@Override
public int deleteTStaEnterpriseInforByIds(Long[] fEnterpriseIds)
{
return tStaEnterpriseInforMapper.deleteTStaEnterpriseInforByIds(fEnterpriseIds);
}
/**
* 删除年度行业指标汇总-燃气企业基本情况信息信息
*
* @param fEnterpriseId 年度行业指标汇总-燃气企业基本情况信息ID
* @return 结果
*/
@Override
public int deleteTStaEnterpriseInforById(Long fEnterpriseId)
{
return tStaEnterpriseInforMapper.deleteTStaEnterpriseInforById(fEnterpriseId);
}
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TEmployedPeopleInfoChangelogMapper">
<resultMap type="com.zehong.system.domain.TEmployedPeopleInfoChangelog" id="TEmployedPeopleInfoChangelogResult">
<result property="id" column="id" />
<result property="employedPeopleName" column="employed_people_name" />
<result property="idCard" column="id_card" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="beforeChange" column="before_change" />
<result property="afterChange" column="after_change" />
<result property="isDel" column="is_del" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTEmployedPeopleInfoChangelogVo">
select id, employed_people_name, id_card, create_time, update_time, before_change, after_change, is_del, remarks from t_employed_people_info_changelog
</sql>
<select id="selectTEmployedPeopleInfoChangelogList" parameterType="com.zehong.system.domain.TEmployedPeopleInfoChangelog" resultMap="TEmployedPeopleInfoChangelogResult">
<include refid="selectTEmployedPeopleInfoChangelogVo"/>
<where>
<if test="employedPeopleName != null and employedPeopleName != ''"> and employed_people_name like concat('%', #{employedPeopleName}, '%')</if>
<if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
<if test="beforeChange != null and beforeChange != ''"> and before_change = #{beforeChange}</if>
<if test="afterChange != null and afterChange != ''"> and after_change = #{afterChange}</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
<select id="selectTEmployedPeopleInfoChangelogById" parameterType="Long" resultMap="TEmployedPeopleInfoChangelogResult">
<include refid="selectTEmployedPeopleInfoChangelogVo"/>
where id = #{id}
</select>
<insert id="insertTEmployedPeopleInfoChangelog" parameterType="com.zehong.system.domain.TEmployedPeopleInfoChangelog" useGeneratedKeys="true" keyProperty="id">
insert into t_employed_people_info_changelog
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="employedPeopleName != null">employed_people_name,</if>
<if test="idCard != null">id_card,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="beforeChange != null">before_change,</if>
<if test="afterChange != null">after_change,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="employedPeopleName != null">#{employedPeopleName},</if>
<if test="idCard != null">#{idCard},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="beforeChange != null">#{beforeChange},</if>
<if test="afterChange != null">#{afterChange},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
<update id="updateTEmployedPeopleInfoChangelog" parameterType="com.zehong.system.domain.TEmployedPeopleInfoChangelog">
update t_employed_people_info_changelog
<trim prefix="SET" suffixOverrides=",">
<if test="employedPeopleName != null">employed_people_name = #{employedPeopleName},</if>
<if test="idCard != null">id_card = #{idCard},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="beforeChange != null">before_change = #{beforeChange},</if>
<if test="afterChange != null">after_change = #{afterChange},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTEmployedPeopleInfoChangelogById" parameterType="Long">
delete from t_employed_people_info_changelog where id = #{id}
</delete>
<delete id="deleteTEmployedPeopleInfoChangelogByIds" parameterType="String">
delete from t_employed_people_info_changelog where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
import request from '@/utils/request'
// 查询从业人员信息变更记录列表
export function listChangelog(query) {
return request({
url: '/system/changelog/list',
method: 'get',
params: query
})
}
// 查询从业人员信息变更记录详细
export function getChangelog(employedPeopleId) {
return request({
url: '/system/changelog/' + employedPeopleId,
method: 'get'
})
}
// 新增从业人员信息变更记录
export function addChangelog(data) {
return request({
url: '/system/changelog',
method: 'post',
data: data
})
}
// 修改从业人员信息变更记录
export function updateChangelog(data) {
return request({
url: '/system/changelog',
method: 'put',
data: data
})
}
// 删除从业人员信息变更记录
export function delChangelog(employedPeopleId) {
return request({
url: '/system/changelog/' + employedPeopleId,
method: 'delete'
})
}
// 导出从业人员信息变更记录
export function exportChangelog(query) {
return request({
url: '/system/changelog/export',
method: 'get',
params: query
})
}
import request from '@/utils/request'
// 查询年度行业指标汇总-燃气企业基本情况信息列表
export function listInfor(query) {
return request({
url: '/system/infor/list',
method: 'get',
params: query
})
}
// 查询年度行业指标汇总-燃气企业基本情况信息详细
export function getInfor(fEnterpriseId) {
return request({
url: '/system/infor/' + fEnterpriseId,
method: 'get'
})
}
// 新增年度行业指标汇总-燃气企业基本情况信息
export function addInfor(data) {
return request({
url: '/system/infor',
method: 'post',
data: data
})
}
// 修改年度行业指标汇总-燃气企业基本情况信息
export function updateInfor(data) {
return request({
url: '/system/infor',
method: 'put',
data: data
})
}
// 删除年度行业指标汇总-燃气企业基本情况信息
export function delInfor(fEnterpriseId) {
return request({
url: '/system/infor/' + fEnterpriseId,
method: 'delete'
})
}
// 导出年度行业指标汇总-燃气企业基本情况信息
export function exportInfor(query) {
return request({
url: '/system/infor/export',
method: 'get',
params: query
})
}
...@@ -94,6 +94,14 @@ ...@@ -94,6 +94,14 @@
<span class="badge" v-if="importError !== 0">{{importError}}</span> <span class="badge" v-if="importError !== 0">{{importError}}</span>
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-download"
size="mini"
@click="getChangeRecords">获取变更记录</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -152,8 +160,14 @@ ...@@ -152,8 +160,14 @@
<!-- <span v-else>-</span>--> <!-- <span v-else>-</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
>详情</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -166,6 +180,12 @@ ...@@ -166,6 +180,12 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button> >删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="getChangelogList(scope.row)"
>变更记录</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -333,11 +353,135 @@ ...@@ -333,11 +353,135 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
<!-- 从业人员详情对话框 -->
<el-dialog :title="viewTitle" :visible.sync="viewOpen" width="800px" append-to-body>
<el-form :model="viewForm" label-width="130px">
<el-row>
<el-col :span="11">
<el-form-item label="姓名">
<span>{{ viewForm.employedPeopleName || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号">
<span>{{ viewForm.idCard || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="照片">
<img v-if="viewForm.avatarAddress" :src="viewForm.avatarAddress" width="200px">
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="发证日期">
<span>{{ viewForm.issueDate || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="受聘企业名称">
<span>{{ viewForm.beyondEnterpriseName || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="发证部门">
<span>{{ viewForm.registerExaminationType || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任职岗位">
<span>{{ peopleOccupationTypeFormat(viewForm) || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="技能岗位证书编号">
<span>{{ viewForm.certificateNum || '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复检日期">
<span>{{ viewForm.certificateChange || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="备注">
<span>{{ viewForm.remarks || '-' }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="viewOpen = false">关 闭</el-button>
</div>
</el-dialog>
<!-- 变更记录列表对话框 -->
<el-dialog :title="changelogTitle" :visible.sync="changelogOpen" width="900px" append-to-body>
<el-table v-loading="changelogLoading" :data="changelogList">
<el-table-column label="姓名" align="center" prop="employedPeopleName" width="120">
<template slot-scope="scope">
<span>{{ scope.row.employedPeopleName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="身份证号" align="center" prop="idCard" width="180">
<template slot-scope="scope">
<span>{{ scope.row.idCard || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="变更前" align="center" prop="beforeChange" min-width="200">
<template slot-scope="scope">
<span>{{ scope.row.beforeChange || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="变更后" align="center" prop="afterChange" min-width="200">
<template slot-scope="scope">
<span>{{ scope.row.afterChange || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="变更时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ scope.row.updateTime || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remarks" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.remarks || '-' }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="changelogTotal>0"
:total="changelogTotal"
:page.sync="changelogQueryParams.pageNum"
:limit.sync="changelogQueryParams.pageSize"
@pagination="getChangelogList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="changelogOpen = false">关 闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo,importErrorexportInfo, selectTEnterprise,queryPeopleOccupationByGroupBy,importTemplate,countImportError,clearImportError} from "@/api/regulation/supervise"; import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo,importErrorexportInfo, selectTEnterprise,queryPeopleOccupationByGroupBy,importTemplate,countImportError,clearImportError} from "@/api/regulation/supervise";
import { listChangelog } from "@/api/regulation/changelog";
import FileUpload from '@/components/FileSuperviseUpload'; import FileUpload from '@/components/FileSuperviseUpload';
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
...@@ -391,6 +535,28 @@ export default { ...@@ -391,6 +535,28 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 详情对话框是否显示
viewOpen: false,
// 详情对话框标题
viewTitle: "从业人员详情",
// 详情表单数据
viewForm: {},
// 变更记录对话框是否显示
changelogOpen: false,
// 变更记录对话框标题
changelogTitle: "从业人员变更记录",
// 变更记录列表数据
changelogList: [],
// 变更记录查询参数
changelogQueryParams: {
pageNum: 1,
pageSize: 10,
idCard: null
},
// 变更记录总条数
changelogTotal: 0,
// 变更记录遮罩层
changelogLoading: true,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -500,6 +666,10 @@ export default { ...@@ -500,6 +666,10 @@ export default {
}) })
}, },
getChangeRecords(){
this.msgSuccess("获取成功");
},
// 下载从业人员错误 按钮 // 下载从业人员错误 按钮
handleImportError() { handleImportError() {
if(this.importError === 0) { if(this.importError === 0) {
...@@ -552,6 +722,19 @@ export default { ...@@ -552,6 +722,19 @@ export default {
checkFile(url) { checkFile(url) {
window.open(url,'_blank'); window.open(url,'_blank');
}, },
/** 查询变更记录列表 */
getChangelogList(row) {
if (row && row.employedPeopleId) {
this.changelogQueryParams.idCard = row.idCard;
}
this.changelogLoading = true;
listChangelog(this.changelogQueryParams).then(response => {
this.changelogList = response.rows;
this.changelogTotal = response.total;
this.changelogLoading = false;
this.changelogOpen = true;
});
},
/** 查询从业人员信息列表 */ /** 查询从业人员信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -617,6 +800,14 @@ export default { ...@@ -617,6 +800,14 @@ export default {
this.open = true; this.open = true;
this.title = "添加从业人员信息"; this.title = "添加从业人员信息";
}, },
/** 详情按钮操作 */
handleView(row) {
const employedPeopleId = row.employedPeopleId
getInfo(employedPeopleId).then(response => {
this.viewForm = response.data;
this.viewOpen = true;
});
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
//查询企业名称下拉框数据 //查询企业名称下拉框数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment