树结构修改,新增企业新表模块,sys_user字段新增

zhangtao
dongdingding 1 year ago
parent a77c9bb829
commit be64dba0b5

@ -1,112 +0,0 @@
//package com.ruoyi.programManagement.controller;
//
//import com.ruoyi.common.core.controller.BaseController;
//import com.ruoyi.common.core.domain.AjaxResult;
//import com.ruoyi.common.core.page.TableDataInfo;
//import com.ruoyi.common.utils.StringUtils;
//import com.ruoyi.common.utils.poi.ExcelUtil;
//import com.ruoyi.programManagement.entity.BAdministrative;
//import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
//import com.ruoyi.programManagement.service.IBAdministrativeService;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.transaction.annotation.Transactional;
//import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.http.HttpServletResponse;
//import java.util.ArrayList;
//import java.util.List;
//
///**
// * 行政区划Controller
// *
// * @author ruoyi
// * @date 2023-09-11
// */
//@Api(tags = "行政区划")
//@Transactional(rollbackFor = Exception.class)
//@RestController
//@RequestMapping("/pharmaceuticals/administrative")
//public class BAdministrativeController extends BaseController {
// @Autowired
// private IBAdministrativeService bAdministrativeService;
//
// /**
// * 查询行政区划列表
// */
// @GetMapping("/list")
// public TableDataInfo list(BAdministrative bAdministrative) {
// startPage();
// List<BAdministrative> list = bAdministrativeService.selectBAdministrativeList(bAdministrative);
// return getDataTable(list);
// }
//
// /**
// * 导出行政区划列表
// */
// @PostMapping("/export")
// public void export(HttpServletResponse response, BAdministrative bAdministrative) {
// List<BAdministrative> list = bAdministrativeService.selectBAdministrativeList(bAdministrative);
// ExcelUtil<BAdministrative> util = new ExcelUtil<BAdministrative>(BAdministrative.class);
// util.exportExcel(response, list, "行政区划数据");
// }
//
// /**
// * 获取行政区划详细信息
// */
// @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") Long id) {
// return success(bAdministrativeService.selectBAdministrativeById(id));
// }
//
// /**
// * 新增行政区划
// */
//
// @PostMapping
// public AjaxResult add(@RequestBody BAdministrative bAdministrative) {
// return toAjax(bAdministrativeService.insertBAdministrative(bAdministrative));
// }
//
// /**
// * 修改行政区划
// */
// @PutMapping
// public AjaxResult edit(@RequestBody BAdministrative bAdministrative) {
// return toAjax(bAdministrativeService.updateBAdministrative(bAdministrative));
// }
//
// /**
// * 删除行政区划
// */
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids) {
// return toAjax(bAdministrativeService.deleteBAdministrativeByIds(ids));
// }
//
// /**
// * 行政区划树结构
// */
// @ApiOperation(value = "行政区划树结构")
// @GetMapping("/tree")
// public AjaxResult tree() {
// List<BAdministrativeTreeRequest> list = bAdministrativeService.selectBAdministrativeTreeRequestList();
// List<BAdministrativeTreeRequest> listsub = bAdministrativeService.selectcascadingSelectDataList();
// List<BAdministrativeTreeRequest> cascadingSelectData = new ArrayList<>();
// for (BAdministrativeTreeRequest item1 : list) {
// BAdministrativeTreeRequest parentDto = new BAdministrativeTreeRequest(item1.getCounty(), item1.getSubdistrict(), item1.getInstitutionName());
// for (BAdministrativeTreeRequest item2 : listsub) {
// if (item2.getSubdistrict()!=null && !item2.getSubdistrict().equals("")){
// if (item2.getSubdistrict().substring(0, 7).equals(item1.getCounty().substring(0, 7))) {
// BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getSubdistrict(), item2.getInstitutionName());
// parentDto.addChild(childDto);
// }
// }
// }
// cascadingSelectData.add(parentDto);
// }
// return success(cascadingSelectData);
// }
//
//}

@ -0,0 +1,127 @@
package com.ruoyi.programManagement.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.programManagement.domain.BAdministrativeDivision;
import com.ruoyi.programManagement.service.IBAdministrativeDivisionService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import javax.annotation.Resource;
/**
* Controller
*
* @author ruoyi
* @since 2023-12-12
*/
@Api(tags = "行政区划")
@RestController
@RequestMapping("/pharmaceuticals/division")
public class BAdministrativeDivisionController extends BaseController {
@Resource
private IBAdministrativeDivisionService bAdministrativeDivisionService;
/**
*
*/
@ApiOperation(value = "查询行政区划列表", response = BAdministrativeDivision.class)
@GetMapping("/list")
public TableDataInfo list(BAdministrativeDivision bAdministrativeDivision) {
startPage();
List<BAdministrativeDivision> list = bAdministrativeDivisionService.selectBAdministrativeDivisionList(bAdministrativeDivision);
return getDataTable(list);
}
/**
*
*/
@ApiOperation(value = "导出行政区划列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BAdministrativeDivision bAdministrativeDivision) {
List<BAdministrativeDivision> list = bAdministrativeDivisionService.selectBAdministrativeDivisionList(bAdministrativeDivision);
ExcelUtil<BAdministrativeDivision> util = new ExcelUtil<BAdministrativeDivision>(BAdministrativeDivision. class);
util.exportExcel(response, list, "行政区划数据");
}
/**
*
*/
@ApiOperation(value = " 获取行政区划详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bAdministrativeDivisionService.selectBAdministrativeDivisionById(id));
}
/**
*
*/
@ApiOperation(value = " 新增行政区划")
@PostMapping
public AjaxResult add(@RequestBody BAdministrativeDivision bAdministrativeDivision) {
return toAjax(bAdministrativeDivisionService.insertBAdministrativeDivision(bAdministrativeDivision));
}
/**
*
*/
@ApiOperation(value = " 修改行政区划")
@PutMapping
public AjaxResult edit(@RequestBody BAdministrativeDivision bAdministrativeDivision) {
return toAjax(bAdministrativeDivisionService.updateBAdministrativeDivision(bAdministrativeDivision));
}
/**
*
*/
@ApiOperation(value = " 删除行政区划")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bAdministrativeDivisionService.deleteBAdministrativeDivisionByIds(ids));
}
/**
*
*/
@ApiOperation(value = "行政区划树结构")
@GetMapping("/tree")
public AjaxResult tree() {
//区划list
List<BAdministrativeDistrictRequest> list = bAdministrativeDivisionService.selectBycountyList();
//乡镇list
List<BAdministrativeTreeRequest> listsub = bAdministrativeDivisionService.selectByDistctList();
List<BAdministrativeDistrictRequest> cascadingSelectData = new ArrayList<>();
for (BAdministrativeDistrictRequest item1 : list) {
BAdministrativeDistrictRequest parentDto = new BAdministrativeDistrictRequest(item1.getDistrictCode(),item1.getDistrict());
for (BAdministrativeTreeRequest item2 : listsub) {
if (item2.getCountyCode() != null && !item2.getCountyCode().equals("")) {
if (item2.getCountyCode().substring(0,6).equals(item1.getDistrictCode())) {
BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getCountyCode(),item2.getSort());
parentDto.addChild(childDto);
}
}
}
cascadingSelectData.add(parentDto);
}
return success(cascadingSelectData);
}
}

@ -0,0 +1,88 @@
package com.ruoyi.programManagement.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.programManagement.entity.BEnterpriseNew;
import com.ruoyi.programManagement.service.IBEnterpriseNewService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* Controller
*
* @author ruoyi
* @since 2023-12-12
*/
@Api(tags = "企业新表")
@RestController
@RequestMapping("/programManagement/new")
public class BEnterpriseNewController extends BaseController {
@Resource
private IBEnterpriseNewService bEnterpriseNewService;
/**
*
*/
@ApiOperation(value = "查询企业新表列表", response = BEnterpriseNew.class)
@GetMapping("/list")
public TableDataInfo list(BEnterpriseNew bEnterpriseNew) {
startPage();
List<BEnterpriseNew> list = bEnterpriseNewService.selectBEnterpriseNewList(bEnterpriseNew);
return getDataTable(list);
}
/**
*
*/
@ApiOperation(value = "导出企业新表列表")
@PostMapping("/export")
public void export(HttpServletResponse response, BEnterpriseNew bEnterpriseNew) {
List<BEnterpriseNew> list = bEnterpriseNewService.selectBEnterpriseNewList(bEnterpriseNew);
ExcelUtil<BEnterpriseNew> util = new ExcelUtil<BEnterpriseNew>(BEnterpriseNew.class);
util.exportExcel(response, list, "企业新表数据");
}
/**
*
*/
@ApiOperation(value = " 获取企业新表详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bEnterpriseNewService.selectBEnterpriseNewById(id));
}
/**
*
*/
@ApiOperation(value = " 新增企业新表")
@PostMapping
public AjaxResult add(@RequestBody BEnterpriseNew bEnterpriseNew) {
return toAjax(bEnterpriseNewService.insertBEnterpriseNew(bEnterpriseNew));
}
/**
*
*/
@ApiOperation(value = " 修改企业新表")
@PutMapping
public AjaxResult edit(@RequestBody BEnterpriseNew bEnterpriseNew) {
return toAjax(bEnterpriseNewService.updateBEnterpriseNew(bEnterpriseNew));
}
/**
*
*/
@ApiOperation(value = " 删除企业新表")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bEnterpriseNewService.deleteBEnterpriseNewByIds(ids));
}
}

@ -1,92 +0,0 @@
//package com.ruoyi.programManagement.controller;
//
//import com.ruoyi.common.core.controller.BaseController;
//import com.ruoyi.common.core.domain.AjaxResult;
//import com.ruoyi.common.core.page.TableDataInfo;
//import com.ruoyi.common.utils.poi.ExcelUtil;
//import com.ruoyi.programManagement.entity.SzEntBasicInfo;
//import com.ruoyi.programManagement.entity.request.SzEntBasicInfoPageRequest;
//import com.ruoyi.programManagement.entity.response.SzEntBasicInfoPageResponse;
//import com.ruoyi.programManagement.service.ISzEntBasicInfoService;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.transaction.annotation.Transactional;
//import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.http.HttpServletResponse;
//import javax.validation.Valid;
//import java.util.List;
//
///**
// * 企业基本信息Controller
// *
// * @author ruoyi
// * @date 2023-09-09
// */
//@RestController
//@RequestMapping("/pharmaceuticals/info")
//@Api(tags = "企业基本信息")
//@Transactional(rollbackFor = Exception.class)
//public class SzEntBasicInfoController extends BaseController {
// @Autowired
// private ISzEntBasicInfoService szEntBasicInfoService;
//
// /**
// * 分页查询企业基本信息列表
// *
// * @Parm req 请求类
// */
// @ApiOperation(value = "分页查询企业基本信息列表", response = SzEntBasicInfoPageResponse.class)
// @GetMapping("/list")
// public AjaxResult page(@Valid SzEntBasicInfoPageRequest req) {
// return success(szEntBasicInfoService.page(req));
// }
//
//
// /**
// * 导出企业基本信息列表
// */
// @PostMapping("/export")
// public void export(HttpServletResponse response, SzEntBasicInfo szEntBasicInfo) {
// List<SzEntBasicInfo> list = szEntBasicInfoService.selectSzEntBasicInfoList(szEntBasicInfo);
// ExcelUtil<SzEntBasicInfo> util = new ExcelUtil<SzEntBasicInfo>(SzEntBasicInfo.class);
// util.exportExcel(response, list, "企业基本信息数据");
// }
//
// /**
// * 获取企业基本信息详细信息
// */
//
// @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") String ID) {
// return success(szEntBasicInfoService.selectSzEntBasicInfoByID(ID));
// }
//
// /**
// * 新增企业基本信息
// */
//
// @PostMapping
// public AjaxResult add(@RequestBody SzEntBasicInfo szEntBasicInfo) {
// return toAjax(szEntBasicInfoService.insertSzEntBasicInfo(szEntBasicInfo));
// }
//
// /**
// * 修改企业基本信息
// */
//
// @PutMapping
// public AjaxResult edit(@RequestBody SzEntBasicInfo szEntBasicInfo) {
// return toAjax(szEntBasicInfoService.updateSzEntBasicInfo(szEntBasicInfo));
// }
//
// /**
// * 删除企业基本信息
// */
//
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable String[] IDs) {
// return toAjax(szEntBasicInfoService.deleteSzEntBasicInfoByIDs(IDs));
// }
//}

@ -87,27 +87,27 @@ public class SzsAdministrativeDivisionController extends BaseController {
} }
/** // /**
* // * 行政区划树结构
*/ // */
@ApiOperation(value = "行政区划树结构") // @ApiOperation(value = "行政区划树结构")
@GetMapping("/tree") // @GetMapping("/tree")
public AjaxResult tree() { // public AjaxResult tree() {
List<BAdministrativeTreeRequest> list = szsAdministrativeDivisionService.selectBAdministrativeTreeRequestList(); // List<BAdministrativeTreeRequest> list = szsAdministrativeDivisionService.selectBAdministrativeTreeRequestList();
List<BAdministrativeTreeRequest> listsub = szsAdministrativeDivisionService.selectcascadingSelectDataList(); // List<BAdministrativeTreeRequest> listsub = szsAdministrativeDivisionService.selectcascadingSelectDataList();
List<BAdministrativeTreeRequest> cascadingSelectData = new ArrayList<>(); // List<BAdministrativeTreeRequest> cascadingSelectData = new ArrayList<>();
for (BAdministrativeTreeRequest item1 : list) { // for (BAdministrativeTreeRequest item1 : list) {
BAdministrativeTreeRequest parentDto = new BAdministrativeTreeRequest(item1.getCounty(), item1.getSubdistrict(), item1.getInstitutionName()); // BAdministrativeTreeRequest parentDto = new BAdministrativeTreeRequest(item1.getCounty(), item1.getSubdistrict(), item1.getInstitutionName());
for (BAdministrativeTreeRequest item2 : listsub) { // for (BAdministrativeTreeRequest item2 : listsub) {
if (item2.getCounty() != null && !item2.getCounty().equals("")) { // if (item2.getCounty() != null && !item2.getCounty().equals("")) {
if (item2.getCounty().equals(item1.getSubdistrict())) { // if (item2.getCounty().equals(item1.getSubdistrict())) {
BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getSubdistrict(), item2.getInstitutionName()); // BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getSubdistrict(), item2.getInstitutionName());
parentDto.addChild(childDto); // parentDto.addChild(childDto);
} // }
} // }
} // }
cascadingSelectData.add(parentDto); // cascadingSelectData.add(parentDto);
} // }
return success(cascadingSelectData); // return success(cascadingSelectData);
} // }
} }

@ -0,0 +1,61 @@
package com.ruoyi.programManagement.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* b_administrative_division
*
* @author ruoyi
* @since 2023-12-12
*/
@Data
@ApiModel("行政区划")
public class BAdministrativeDivision extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* $column.columnComment
*/
private Long id;
/**
*
*/
@Excel(name = "区县代码")
@ApiModelProperty(value = "区县代码")
private String districtCode;
/**
*
*/
@Excel(name = "区县")
@ApiModelProperty(value = "区县")
private String district;
/**
*
*/
@Excel(name = "乡镇代码")
@ApiModelProperty(value = "乡镇代码")
private String countyCode;
/**
*
*/
@Excel(name = "乡镇")
@ApiModelProperty(value = "乡镇")
private String county;
/**
*
*/
@Excel(name = "排序")
@ApiModelProperty(value = "排序")
private Long sort;
}

@ -0,0 +1,109 @@
package com.ruoyi.programManagement.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* b_enterprise_new
*
* @author ruoyi
* @since 2023-12-12
*/
@Data
@ApiModel("企业新表")
public class BEnterpriseNew extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* $column.columnComment
*/
private Long id;
/**
* id
*/
@Excel(name = "企业id")
@ApiModelProperty(value = "企业id")
private String enterpriseId;
/**
*
*/
@Excel(name = "企业名称")
@ApiModelProperty(value = "企业名称")
private String enterpriseName;
/**
*
*/
@Excel(name = "行政区划")
@ApiModelProperty(value = "行政区划")
private String district;
/**
*
*/
@Excel(name = "行业监管大类编码")
@ApiModelProperty(value = "行业监管大类编码")
private String supervisionLarge;
/**
*
*/
@Excel(name = "安全风险等级")
@ApiModelProperty(value = "安全风险等级")
private String riskLevel;
/**
*
*/
@Excel(name = "标准化等级")
@ApiModelProperty(value = "标准化等级")
private String standLevel;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "上次检查时间")
@Excel(name = "上次检查时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date examineEndTime;
/**
* ID
*/
@Excel(name = "创建者ID")
@ApiModelProperty(value = "创建者ID")
private Long createId;
/**
* ID
*/
@Excel(name = "更新者ID")
@ApiModelProperty(value = "更新者ID")
private Long updateId;
/**
* id
*/
@Excel(name = "用户权限id")
@ApiModelProperty(value = "用户权限id")
private Long userId;
/**
* id
*/
@Excel(name = "部门权限id")
@ApiModelProperty(value = "部门权限id")
private Long deptId;
}

@ -0,0 +1,34 @@
package com.ruoyi.programManagement.entity.request;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@ApiModel
@Data
public class BAdministrativeDistrictRequest {
/**
*
*/
private String districtCode;
/**
*
*/
private String district;
private List<BAdministrativeTreeRequest> children;
public BAdministrativeDistrictRequest(String districtCode,String district) {
this.districtCode = districtCode;
this.district = district;
this.children = new ArrayList<>();
}
public void addChild(BAdministrativeTreeRequest childDto) {
this.children.add(childDto);
}
}

@ -1,6 +1,5 @@
package com.ruoyi.programManagement.entity.request; package com.ruoyi.programManagement.entity.request;
import com.ruoyi.common.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
@ -11,37 +10,37 @@ import java.util.List;
*/ */
@Data @Data
public class BAdministrativeTreeRequest { public class BAdministrativeTreeRequest {
/**
*
*/
private String county;
/** /**
* *
* *
*/ */
private String subdistrict; private String county;
/** /**
* *
*/ */
private String institutionName; private String countyCode;
/**
*
*/
private List<BAdministrativeTreeRequest> children; private String sort;
public BAdministrativeTreeRequest(String county, String subdistrict,String institutionName) { public BAdministrativeTreeRequest(String county, String countyCode,String sort) {
this.county = county; this.county = county;
this.subdistrict = subdistrict; this.countyCode = countyCode;
this.institutionName=institutionName; this.sort = sort;
this.children = new ArrayList<>();
} }
public void addChild(BAdministrativeTreeRequest childDto) {
this.children.add(childDto);
}
} }

@ -0,0 +1,78 @@
package com.ruoyi.programManagement.mapper;
import java.util.List;
import com.ruoyi.programManagement.domain.BAdministrativeDivision;
import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
/**
* Mapper
*
* @author ruoyi
* @since 2023-12-12
*/
public interface BAdministrativeDivisionMapper {
/**
*
*
* @param id
* @return
*/
public BAdministrativeDivision selectBAdministrativeDivisionById(Long id);
/**
*
*
* @param bAdministrativeDivision
* @return
*/
List<BAdministrativeDivision> selectBAdministrativeDivisionList(BAdministrativeDivision bAdministrativeDivision);
/**
*
*
* @param bAdministrativeDivision
* @return
*/
int insertBAdministrativeDivision(BAdministrativeDivision bAdministrativeDivision);
/**
*
*
* @param bAdministrativeDivision
* @return
*/
int updateBAdministrativeDivision(BAdministrativeDivision bAdministrativeDivision);
/**
*
*
* @param id
* @return
*/
int deleteBAdministrativeDivisionById(Long id);
/**
*
*
* @param ids
* @return
*/
int deleteBAdministrativeDivisionByIds(Long[] ids);
/**
*
* @return list
*/
List<BAdministrativeTreeRequest> selectByDistctList();
/**
*
*
* @return list
*/
List<BAdministrativeDistrictRequest> selectBycountyList();
}

@ -0,0 +1,63 @@
package com.ruoyi.programManagement.mapper;
import com.ruoyi.programManagement.entity.BEnterpriseNew;
import java.util.List;
/**
* Mapper
*
* @author ruoyi
* @since 2023-12-12
*/
public interface BEnterpriseNewMapper {
/**
*
*
* @param id
* @return
*/
public BEnterpriseNew selectBEnterpriseNewById(Long id);
/**
*
*
* @param bEnterpriseNew
* @return
*/
List<BEnterpriseNew> selectBEnterpriseNewList(BEnterpriseNew bEnterpriseNew);
/**
*
*
* @param bEnterpriseNew
* @return
*/
int insertBEnterpriseNew(BEnterpriseNew bEnterpriseNew);
/**
*
*
* @param bEnterpriseNew
* @return
*/
int updateBEnterpriseNew(BEnterpriseNew bEnterpriseNew);
/**
*
*
* @param id
* @return
*/
int deleteBEnterpriseNewById(Long id);
/**
*
*
* @param ids
* @return
*/
int deleteBEnterpriseNewByIds(Long[] ids);
}

@ -0,0 +1,79 @@
package com.ruoyi.programManagement.service;
import com.ruoyi.programManagement.domain.BAdministrativeDivision;
import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @since 2023-12-12
*/
public interface IBAdministrativeDivisionService {
/**
*
*
* @param id
* @return
*/
public BAdministrativeDivision selectBAdministrativeDivisionById(Long id);
/**
*
*
* @param bAdministrativeDivision
* @return
*/
List<BAdministrativeDivision> selectBAdministrativeDivisionList(BAdministrativeDivision bAdministrativeDivision);
/**
*
*
* @param bAdministrativeDivision
* @return
*/
int insertBAdministrativeDivision(BAdministrativeDivision bAdministrativeDivision);
/**
*
*
* @param bAdministrativeDivision
* @return
*/
int updateBAdministrativeDivision(BAdministrativeDivision bAdministrativeDivision);
/**
*
*
* @param ids
* @return
*/
int deleteBAdministrativeDivisionByIds(Long[] ids);
/**
*
*
* @param id
* @return
*/
int deleteBAdministrativeDivisionById(Long id);
/**
*
*
* @return list
*/
List<BAdministrativeTreeRequest> selectByDistctList();
/**
*
*
* @return list
*/
List<BAdministrativeDistrictRequest> selectBycountyList();
}

@ -0,0 +1,62 @@
package com.ruoyi.programManagement.service;
import com.ruoyi.programManagement.entity.BEnterpriseNew;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @since 2023-12-12
*/
public interface IBEnterpriseNewService {
/**
*
*
* @param id
* @return
*/
public BEnterpriseNew selectBEnterpriseNewById(Long id);
/**
*
*
* @param bEnterpriseNew
* @return
*/
List<BEnterpriseNew> selectBEnterpriseNewList(BEnterpriseNew bEnterpriseNew);
/**
*
*
* @param bEnterpriseNew
* @return
*/
int insertBEnterpriseNew(BEnterpriseNew bEnterpriseNew);
/**
*
*
* @param bEnterpriseNew
* @return
*/
int updateBEnterpriseNew(BEnterpriseNew bEnterpriseNew);
/**
*
*
* @param ids
* @return
*/
int deleteBEnterpriseNewByIds(Long[] ids);
/**
*
*
* @param id
* @return
*/
int deleteBEnterpriseNewById(Long id);
}

@ -0,0 +1,99 @@
package com.ruoyi.programManagement.service.impl;
import java.util.List;
import com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest;
import com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest;
import org.springframework.stereotype.Service;
import com.ruoyi.programManagement.mapper.BAdministrativeDivisionMapper;
import com.ruoyi.programManagement.domain.BAdministrativeDivision;
import com.ruoyi.programManagement.service.IBAdministrativeDivisionService;
import javax.annotation.Resource;
/**
* Service
*
* @author ruoyi
* @since 2023-12-12
*/
@Service
public class BAdministrativeDivisionServiceImpl implements IBAdministrativeDivisionService {
@Resource
private BAdministrativeDivisionMapper bAdministrativeDivisionMapper;
/**
*
*
* @param id
* @return
*/
@Override
public BAdministrativeDivision selectBAdministrativeDivisionById(Long id) {
return bAdministrativeDivisionMapper.selectBAdministrativeDivisionById(id);
}
/**
*
*
* @param bAdministrativeDivision
* @return
*/
@Override
public List<BAdministrativeDivision> selectBAdministrativeDivisionList(BAdministrativeDivision bAdministrativeDivision) {
return bAdministrativeDivisionMapper.selectBAdministrativeDivisionList(bAdministrativeDivision);
}
/**
*
*
* @param bAdministrativeDivision
* @return
*/
@Override
public int insertBAdministrativeDivision(BAdministrativeDivision bAdministrativeDivision) {
return bAdministrativeDivisionMapper.insertBAdministrativeDivision(bAdministrativeDivision);
}
/**
*
*
* @param bAdministrativeDivision
* @return
*/
@Override
public int updateBAdministrativeDivision(BAdministrativeDivision bAdministrativeDivision) {
return bAdministrativeDivisionMapper.updateBAdministrativeDivision(bAdministrativeDivision);
}
/**
*
*
* @param ids
* @return
*/
@Override
public int deleteBAdministrativeDivisionByIds(Long[] ids) {
return bAdministrativeDivisionMapper.deleteBAdministrativeDivisionByIds(ids);
}
/**
*
*
* @param id
* @return
*/
@Override
public int deleteBAdministrativeDivisionById(Long id) {
return bAdministrativeDivisionMapper.deleteBAdministrativeDivisionById(id);
}
@Override
public List<BAdministrativeTreeRequest> selectByDistctList() {
return bAdministrativeDivisionMapper.selectByDistctList();
}
@Override
public List<BAdministrativeDistrictRequest> selectBycountyList() {
return bAdministrativeDivisionMapper.selectBycountyList();
}
}

@ -0,0 +1,90 @@
package com.ruoyi.programManagement.service.impl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.programManagement.entity.BEnterpriseNew;
import com.ruoyi.programManagement.mapper.BEnterpriseNewMapper;
import com.ruoyi.programManagement.service.IBEnterpriseNewService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @since 2023-12-12
*/
@Service
public class BEnterpriseNewServiceImpl implements IBEnterpriseNewService {
@Resource
private BEnterpriseNewMapper bEnterpriseNewMapper;
/**
*
*
* @param id
* @return
*/
@Override
public BEnterpriseNew selectBEnterpriseNewById(Long id) {
return bEnterpriseNewMapper.selectBEnterpriseNewById(id);
}
/**
*
*
* @param bEnterpriseNew
* @return
*/
@Override
public List<BEnterpriseNew> selectBEnterpriseNewList(BEnterpriseNew bEnterpriseNew) {
return bEnterpriseNewMapper.selectBEnterpriseNewList(bEnterpriseNew);
}
/**
*
*
* @param bEnterpriseNew
* @return
*/
@Override
public int insertBEnterpriseNew(BEnterpriseNew bEnterpriseNew) {
bEnterpriseNew.setCreateTime(DateUtils.getNowDate());
return bEnterpriseNewMapper.insertBEnterpriseNew(bEnterpriseNew);
}
/**
*
*
* @param bEnterpriseNew
* @return
*/
@Override
public int updateBEnterpriseNew(BEnterpriseNew bEnterpriseNew) {
bEnterpriseNew.setUpdateTime(DateUtils.getNowDate());
return bEnterpriseNewMapper.updateBEnterpriseNew(bEnterpriseNew);
}
/**
*
*
* @param ids
* @return
*/
@Override
public int deleteBEnterpriseNewByIds(Long[] ids) {
return bEnterpriseNewMapper.deleteBEnterpriseNewByIds(ids);
}
/**
*
*
* @param id
* @return
*/
@Override
public int deleteBEnterpriseNewById(Long id) {
return bEnterpriseNewMapper.deleteBEnterpriseNewById(id);
}
}

@ -7,9 +7,12 @@ spring:
# 主库数据源 # 主库数据源
master: master:
#本地 #本地
url: jdbc:mysql://39.101.188.84:3307/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://39.101.188.84:3307/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
url: jdbc:mysql://localhost:3306/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: Admin123@ password: adminadmin
# url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC # url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC
# username: root # username: root
# password: Jichuang@2023 # password: Jichuang@2023

@ -45,7 +45,7 @@ logging:
user: user:
password: password:
# 密码最大错误次数 # 密码最大错误次数
maxRetryCount: 5 maxRetryCount: 599
# 密码锁定时间默认10分钟 # 密码锁定时间默认10分钟
lockTime: 10 lockTime: 10
@ -133,4 +133,4 @@ xss:
# 排除链接(多个用逗号分隔) # 排除链接(多个用逗号分隔)
excludes: /system/notice excludes: /system/notice
# 匹配链接 # 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*-303

@ -129,6 +129,14 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies> </dependencies>

@ -1,299 +1,327 @@
package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss; import com.ruoyi.common.xss.Xss;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
/** /**
* sys_user * sys_user
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysUser extends BaseEntity @Data
{ public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 用户ID */ /**
*
*/
private Long lawSort;
/**
*
*/
private String lawAreas;
/**
*
*/
private String lawLevel;
/**
*
*/
private String permissionDescription;
/**
*
*/
private String permissionCode;
/**
* ID
*/
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId; private Long userId;
/** 部门ID */ /**
* ID
*/
@Excel(name = "部门编号", type = Type.IMPORT) @Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId; private Long deptId;
/** 用户账号 */ /**
*
*/
@Excel(name = "登录名称") @Excel(name = "登录名称")
private String userName; private String userName;
/** 用户昵称 */ /**
*
*/
@Excel(name = "用户名称") @Excel(name = "用户名称")
private String nickName; private String nickName;
/** 用户邮箱 */ /**
*
*/
@Excel(name = "用户邮箱") @Excel(name = "用户邮箱")
private String email; private String email;
/** 手机号码 */ /**
*
*/
@Excel(name = "手机号码") @Excel(name = "手机号码")
private String phonenumber; private String phonenumber;
/** 用户性别 */ /**
*
*/
@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
private String sex; private String sex;
/** 用户头像 */ /**
*
*/
private String avatar; private String avatar;
/** 密码 */ /**
*
*/
private String password; private String password;
/** 帐号状态0正常 1停用 */ /**
* 0 1
*/
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
/** 删除标志0代表存在 2代表删除 */ /**
* 0 2
*/
private String delFlag; private String delFlag;
/** 最后登录IP */ /**
* IP
*/
@Excel(name = "最后登录IP", type = Type.EXPORT) @Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp; private String loginIp;
/** 最后登录时间 */ /**
*
*/
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate; private Date loginDate;
/** 部门对象 */ /**
*
*/
@Excels({ @Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
}) })
private SysDept dept; private SysDept dept;
/** 角色对象 */ /**
*
*/
private List<SysRole> roles; private List<SysRole> roles;
/** 角色组 */ /**
*
*/
private Long[] roleIds; private Long[] roleIds;
/** 岗位组 */ /**
*
*/
private Long[] postIds; private Long[] postIds;
/** 角色ID */ /**
* ID
*/
private Long roleId; private Long roleId;
public SysUser() public SysUser() {
{
} }
public SysUser(Long userId) public SysUser(Long userId) {
{
this.userId = userId; this.userId = userId;
} }
public Long getUserId() public Long getUserId() {
{
return userId; return userId;
} }
public void setUserId(Long userId) public void setUserId(Long userId) {
{
this.userId = userId; this.userId = userId;
} }
public boolean isAdmin() public boolean isAdmin() {
{
return isAdmin(this.userId); return isAdmin(this.userId);
} }
public static boolean isAdmin(Long userId) public static boolean isAdmin(Long userId) {
{
return userId != null && 1L == userId; return userId != null && 1L == userId;
} }
public Long getDeptId() public Long getDeptId() {
{
return deptId; return deptId;
} }
public void setDeptId(Long deptId) public void setDeptId(Long deptId) {
{
this.deptId = deptId; this.deptId = deptId;
} }
@Xss(message = "用户昵称不能包含脚本字符") @Xss(message = "用户昵称不能包含脚本字符")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
public String getNickName() public String getNickName() {
{
return nickName; return nickName;
} }
public void setNickName(String nickName) public void setNickName(String nickName) {
{
this.nickName = nickName; this.nickName = nickName;
} }
@Xss(message = "用户账号不能包含脚本字符") @Xss(message = "用户账号不能包含脚本字符")
@NotBlank(message = "用户账号不能为空") @NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
public String getUserName() public String getUserName() {
{
return userName; return userName;
} }
public void setUserName(String userName) public void setUserName(String userName) {
{
this.userName = userName; this.userName = userName;
} }
@Email(message = "邮箱格式不正确") @Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail() public String getEmail() {
{
return email; return email;
} }
public void setEmail(String email) public void setEmail(String email) {
{
this.email = email; this.email = email;
} }
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
public String getPhonenumber() public String getPhonenumber() {
{
return phonenumber; return phonenumber;
} }
public void setPhonenumber(String phonenumber) public void setPhonenumber(String phonenumber) {
{
this.phonenumber = phonenumber; this.phonenumber = phonenumber;
} }
public String getSex() public String getSex() {
{
return sex; return sex;
} }
public void setSex(String sex) public void setSex(String sex) {
{
this.sex = sex; this.sex = sex;
} }
public String getAvatar() public String getAvatar() {
{
return avatar; return avatar;
} }
public void setAvatar(String avatar) public void setAvatar(String avatar) {
{
this.avatar = avatar; this.avatar = avatar;
} }
public String getPassword() public String getPassword() {
{
return password; return password;
} }
public void setPassword(String password) public void setPassword(String password) {
{
this.password = password; this.password = password;
} }
public String getStatus() public String getStatus() {
{
return status; return status;
} }
public void setStatus(String status) public void setStatus(String status) {
{
this.status = status; this.status = status;
} }
public String getDelFlag() public String getDelFlag() {
{
return delFlag; return delFlag;
} }
public void setDelFlag(String delFlag) public void setDelFlag(String delFlag) {
{
this.delFlag = delFlag; this.delFlag = delFlag;
} }
public String getLoginIp() public String getLoginIp() {
{
return loginIp; return loginIp;
} }
public void setLoginIp(String loginIp) public void setLoginIp(String loginIp) {
{
this.loginIp = loginIp; this.loginIp = loginIp;
} }
public Date getLoginDate() public Date getLoginDate() {
{
return loginDate; return loginDate;
} }
public void setLoginDate(Date loginDate) public void setLoginDate(Date loginDate) {
{
this.loginDate = loginDate; this.loginDate = loginDate;
} }
public SysDept getDept() public SysDept getDept() {
{
return dept; return dept;
} }
public void setDept(SysDept dept) public void setDept(SysDept dept) {
{
this.dept = dept; this.dept = dept;
} }
public List<SysRole> getRoles() public List<SysRole> getRoles() {
{
return roles; return roles;
} }
public void setRoles(List<SysRole> roles) public void setRoles(List<SysRole> roles) {
{
this.roles = roles; this.roles = roles;
} }
public Long[] getRoleIds() public Long[] getRoleIds() {
{
return roleIds; return roleIds;
} }
public void setRoleIds(Long[] roleIds) public void setRoleIds(Long[] roleIds) {
{
this.roleIds = roleIds; this.roleIds = roleIds;
} }
public Long[] getPostIds() public Long[] getPostIds() {
{
return postIds; return postIds;
} }
public void setPostIds(Long[] postIds) public void setPostIds(Long[] postIds) {
{
this.postIds = postIds; this.postIds = postIds;
} }
public Long getRoleId() public Long getRoleId() {
{
return roleId; return roleId;
} }
public void setRoleId(Long roleId) public void setRoleId(Long roleId) {
{
this.roleId = roleId; this.roleId = roleId;
} }

@ -23,6 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
<result property="lawSort" column="law_sort"/>
<result property="lawAreas" column="law_areas"/>
<result property="lawLevel" column="law_level"/>
<result property="permissionDescription" column="permission_description"/>
<result property="permissionCode" column="permission_code"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/> <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap> </resultMap>
@ -47,9 +52,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, select u.user_id,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, u.dept_id,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status u.user_name,
u.nick_name,
u.email,
u.avatar,
u.phonenumber,
u.password,
u.sex,
u.status,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
u.law_sort,
u.law_areas,
u.law_level,
u.permission_description,
u.permission_code,
d.dept_id,
d.parent_id,
d.ancestors,
d.dept_name,
d.order_num,
d.leader,
d.status as dept_status,
r.role_id,
r.role_name,
r.role_key,
r.role_sort,
r.data_scope,
r.status as role_status
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
@ -57,7 +93,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.law_sort,
u.law_areas,
u.law_level,
u.permission_description,
u.permission_code, d.dept_name, d.leader from sys_user
u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0' where u.del_flag = '0'
<if test="userId != null and userId != 0"> <if test="userId != null and userId != 0">
@ -79,14 +121,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
ancestors) ))
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</select> </select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.law_sort,
u.law_areas,
u.law_level,
u.permission_description,
u.permission_code
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
@ -103,13 +150,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.law_sort,
u.law_areas,
u.law_level,
u.permission_description,
u.permission_code
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id
where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
ur.role_id = #{roleId})
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{userName}, '%')
</if> </if>
@ -131,15 +183,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1 select user_id, user_name
from sys_user
where user_name = #{userName}
and del_flag = '0' limit 1
</select> </select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1 select user_id, phonenumber
from sys_user
where phonenumber = #{phonenumber}
and del_flag = '0' limit 1
</select> </select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 select user_id, email
from sys_user
where email = #{email}
and del_flag = '0' limit 1
</select> </select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@ -156,6 +217,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
<if test="lawSort != null and lawSort != ''">law_sort,</if>
<if test="lawAreas != null and lawAreas != ''">law_areas,</if>
<if test="lawLevel != null and lawLevel != ''">law_level,</if>
<if test="permissionDescription != null and permissionDescription != ''">permission_description,</if>
<if test="permissionCode != null and permissionCode != ''">permission_code,</if>
create_time create_time
)values( )values(
<if test="userId != null and userId != ''">#{userId},</if> <if test="userId != null and userId != ''">#{userId},</if>
@ -170,6 +236,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
<if test="lawSort != null and lawSort != ''">#{lawSort},</if>
<if test="lawAreas != null and lawAreas != ''">#{lawAreas},</if>
<if test="lawLevel != null and lawLevel != ''">#{lawLevel},</if>
<if test="permissionDescription != null and permissionDescription != ''">#{permissionDescription},</if>
<if test="permissionCode != null and permissionCode != ''">#{permissionCode},</if>
sysdate() sysdate()
) )
</insert> </insert>
@ -190,25 +261,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginDate != null">login_date = #{loginDate},</if> <if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="lawSort != null">law_sort = #{lawSort},</if>
<if test="lawAreas != null">law_areas = #{lawAreas},</if>
<if test="lawLevel != null">law_level = #{lawLevel},</if>
<if test="permissionDescription != null">permission_description = #{permissionDescription},</if>
<if test="permissionCode != null">permission_code = #{permissionCode},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where user_id = #{userId} where user_id = #{userId}
</update> </update>
<update id="updateUserStatus" parameterType="SysUser"> <update id="updateUserStatus" parameterType="SysUser">
update sys_user set status = #{status} where user_id = #{userId} update sys_user
set status = #{status}
where user_id = #{userId}
</update> </update>
<update id="updateUserAvatar" parameterType="SysUser"> <update id="updateUserAvatar" parameterType="SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName} update sys_user
set avatar = #{avatar}
where user_name = #{userName}
</update> </update>
<update id="resetUserPwd" parameterType="SysUser"> <update id="resetUserPwd" parameterType="SysUser">
update sys_user set password = #{password} where user_name = #{userName} update sys_user
set password = #{password}
where user_name = #{userName}
</update> </update>
<delete id="deleteUserById" parameterType="Long"> <delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId} update sys_user
set del_flag = '2'
where user_id = #{userId}
</delete> </delete>
<delete id="deleteUserByIds" parameterType="Long"> <delete id="deleteUserByIds" parameterType="Long">

@ -0,0 +1,92 @@
<?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.ruoyi.programManagement.mapper.BAdministrativeDivisionMapper">
<resultMap type="BAdministrativeDivision" id="BAdministrativeDivisionResult">
<result property="id" column="id"/>
<result property="districtCode" column="district_code"/>
<result property="district" column="district"/>
<result property="countyCode" column="county_code"/>
<result property="county" column="county"/>
<result property="sort" column="sort"/>
</resultMap>
<sql id="selectBAdministrativeDivisionVo">
select id, district_code, district, county_code, county, sort
from b_administrative_division
</sql>
<select id="selectBAdministrativeDivisionList" parameterType="BAdministrativeDivision"
resultMap="BAdministrativeDivisionResult">
<include refid="selectBAdministrativeDivisionVo"/>
<where>
<if test="districtCode != null and districtCode != ''">and district_code = #{districtCode}</if>
<if test="district != null and district != ''">and district = #{district}</if>
<if test="countyCode != null and countyCode != ''">and county_code = #{countyCode}</if>
<if test="county != null and county != ''">and county = #{county}</if>
<if test="sort != null ">and sort = #{sort}</if>
</where>
</select>
<select id="selectBAdministrativeDivisionById" parameterType="Long" resultMap="BAdministrativeDivisionResult">
<include refid="selectBAdministrativeDivisionVo"/>
where id = #{id}
</select>
<select id="selectByDistctList"
resultType="com.ruoyi.programManagement.entity.request.BAdministrativeTreeRequest">
select county_code as countyCode, county, sort
from b_administrative_division
</select>
<select id="selectBycountyList"
resultType="com.ruoyi.programManagement.entity.request.BAdministrativeDistrictRequest">
select district_code as districtCode,district
from b_administrative_division
group by districtCode,district
</select>
<insert id="insertBAdministrativeDivision" parameterType="BAdministrativeDivision" useGeneratedKeys="true"
keyProperty="id">
insert into b_administrative_division
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="districtCode != null">district_code,</if>
<if test="district != null">district,</if>
<if test="countyCode != null">county_code,</if>
<if test="county != null">county,</if>
<if test="sort != null">sort,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="districtCode != null">#{districtCode},</if>
<if test="district != null">#{district},</if>
<if test="countyCode != null">#{countyCode},</if>
<if test="county != null">#{county},</if>
<if test="sort != null">#{sort},</if>
</trim>
</insert>
<update id="updateBAdministrativeDivision" parameterType="BAdministrativeDivision">
update b_administrative_division
<trim prefix="SET" suffixOverrides=",">
<if test="districtCode != null">district_code = #{districtCode},</if>
<if test="district != null">district = #{district},</if>
<if test="countyCode != null">county_code = #{countyCode},</if>
<if test="county != null">county = #{county},</if>
<if test="sort != null">sort = #{sort},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBAdministrativeDivisionById" parameterType="Long">
delete
from b_administrative_division
where id = #{id}
</delete>
<delete id="deleteBAdministrativeDivisionByIds" parameterType="String">
delete from b_administrative_division where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

@ -0,0 +1,126 @@
<?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.ruoyi.programManagement.mapper.BEnterpriseNewMapper">
<resultMap type="BEnterpriseNew" id="BEnterpriseNewResult">
<result property="id" column="id" />
<result property="enterpriseId" column="enterprise_id" />
<result property="enterpriseName" column="enterprise_name" />
<result property="district" column="district" />
<result property="supervisionLarge" column="SUPERVISION_LARGE" />
<result property="riskLevel" column="RISK_LEVEL" />
<result property="standLevel" column="STAND_LEVEL" />
<result property="examineEndTime" column="EXAMINE_END_TIME" />
<result property="createId" column="create_id" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateId" column="update_id" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectBEnterpriseNewVo">
select id, enterprise_id, enterprise_name, district, SUPERVISION_LARGE, RISK_LEVEL, STAND_LEVEL, EXAMINE_END_TIME, create_id, create_by, create_time, update_id, update_by, update_time, remark, user_id, dept_id from b_enterprise_new
</sql>
<select id="selectBEnterpriseNewList" parameterType="BEnterpriseNew" resultMap="BEnterpriseNewResult">
<include refid="selectBEnterpriseNewVo"/>
<where>
<if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="district != null and district != ''"> and district = #{district}</if>
<if test="supervisionLarge != null and supervisionLarge != ''"> and SUPERVISION_LARGE = #{supervisionLarge}</if>
<if test="riskLevel != null and riskLevel != ''"> and RISK_LEVEL = #{riskLevel}</if>
<if test="standLevel != null and standLevel != ''"> and STAND_LEVEL = #{standLevel}</if>
<if test="examineEndTime != null "> and EXAMINE_END_TIME = #{examineEndTime}</if>
<if test="createId != null "> and create_id = #{createId}</if>
<if test="updateId != null "> and update_id = #{updateId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
</select>
<select id="selectBEnterpriseNewById" parameterType="Long" resultMap="BEnterpriseNewResult">
<include refid="selectBEnterpriseNewVo"/>
where id = #{id}
</select>
<insert id="insertBEnterpriseNew" parameterType="BEnterpriseNew" useGeneratedKeys="true" keyProperty="id">
insert into b_enterprise_new
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="enterpriseId != null">enterprise_id,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="district != null">district,</if>
<if test="supervisionLarge != null">SUPERVISION_LARGE,</if>
<if test="riskLevel != null">RISK_LEVEL,</if>
<if test="standLevel != null">STAND_LEVEL,</if>
<if test="examineEndTime != null">EXAMINE_END_TIME,</if>
<if test="createId != null">create_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateId != null">update_id,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="district != null">#{district},</if>
<if test="supervisionLarge != null">#{supervisionLarge},</if>
<if test="riskLevel != null">#{riskLevel},</if>
<if test="standLevel != null">#{standLevel},</if>
<if test="examineEndTime != null">#{examineEndTime},</if>
<if test="createId != null">#{createId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateId != null">#{updateId},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
</trim>
</insert>
<update id="updateBEnterpriseNew" parameterType="BEnterpriseNew">
update b_enterprise_new
<trim prefix="SET" suffixOverrides=",">
<if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="district != null">district = #{district},</if>
<if test="supervisionLarge != null">SUPERVISION_LARGE = #{supervisionLarge},</if>
<if test="riskLevel != null">RISK_LEVEL = #{riskLevel},</if>
<if test="standLevel != null">STAND_LEVEL = #{standLevel},</if>
<if test="examineEndTime != null">EXAMINE_END_TIME = #{examineEndTime},</if>
<if test="createId != null">create_id = #{createId},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateId != null">update_id = #{updateId},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBEnterpriseNewById" parameterType="Long">
delete from b_enterprise_new where id = #{id}
</delete>
<delete id="deleteBEnterpriseNewByIds" parameterType="String">
delete from b_enterprise_new where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save