suzhou-jichuang-lanhai
/
JinJiHuJava
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加自定义模板

Browse Source
wushunjie
杜函宇 9 months ago
parent cf31a4415e
commit ee6826d5bd
72 changed files with 2402 additions and 1376 deletions

7
pom.xml
Unescape View File

@ -20,7 +20,6 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.20</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
<fastjson.version>2.0.43</fastjson.version>
@ -34,12 +33,6 @@
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>

4
ruoyi-admin/pom.xml
Unescape View File

@ -23,8 +23,8 @@
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>4.4.0</version>
</dependency>
<!-- spring-boot-devtools -->
<dependency>

26
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java
Unescape View File

@ -65,10 +65,6 @@ public class BmsDeclarationRecordsController extends BaseController {
/**
* 审核列表
*
* @param approvalDeclarationRecordsQueryDto
* @return {@link TableDataInfo}
* @author emiya.xie
* @create 2023/9/9 14:41
*/
@ApiOperation(value = "审核列表")
@PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
@ -126,7 +122,7 @@ public class BmsDeclarationRecordsController extends BaseController {
for (BmsDeclarationRecordsQueryVo item : rd) {
String itemsFileName = fatherFile + "/" +item.getProjectName()+item.getEnterpriseName();
FileUtil.mkdir(itemsFileName);
String[] splitList = bmsDeclarationRecordsService.getAllFile(item.getTemplateId(), item.getDetailId()).split(",");
List<String> splitList = bmsDeclarationRecordsService.getAllFile(item.getTemplateJson());
for (String s : splitList) {
// 下载文件
try {
@ -167,13 +163,6 @@ public class BmsDeclarationRecordsController extends BaseController {
return getDataTable(list);
}
@Log(title = "下载市局审核申报记录", businessType = BusinessType.EXPORT)
@PostMapping("/exportMunicipalBureauReview")
public void export(HttpServletResponse response) {
List<BmsMunicipalBureauReviewQueryVo> list = bmsDeclarationRecordsService.selectMunicipalBureauReviewList();
ExcelUtil<BmsMunicipalBureauReviewQueryVo> util = new ExcelUtil<BmsMunicipalBureauReviewQueryVo>(BmsMunicipalBureauReviewQueryVo.class);
util.exportExcel(response, list, "在线申报记录数据");
}
/**
@ -217,19 +206,6 @@ public class BmsDeclarationRecordsController extends BaseController {
return toAjax(bmsDeclarationRecordsService.updateBmsDeclarationRecords(bmsDeclarationRecords));
}
// @Log(title = "市级评定结果确认-old", businessType = BusinessType.UPDATE)
// @PostMapping("/municipalReview")
// @Deprecated
// public AjaxResult municipalReview(@RequestBody MunicipalReviewDto municipalReviewDto) {
// return success("市级评定结果确认成功" + bmsDeclarationRecordsService.municipalReview(municipalReviewDto) + "条数据");
// }
// @Log(title = "市级评定结果确认-new", businessType = BusinessType.UPDATE)
// @PostMapping("/municipalReviewNew")
// public AjaxResult municipalReviewNew(@RequestBody MunicipalReviewDto municipalReviewDto) {
// return success("市级评定结果确认成功" + bmsDeclarationRecordsService.municipalReviewNew(municipalReviewDto) + "条数据");
// }
/**
* 删除在线申报记录

66
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseFillController.java
Unescape View File

@ -0,0 +1,66 @@
package com.ruoyi.jjh.declaration.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseFillService;
import com.ruoyi.jjh.declaration.service.IBmsFieldInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
/**
* 企业填报控制层
* @author du
* @since 2024/7/24 13:43
*/
@Api(tags = "企业填报")
@RestController
@RequestMapping("/system/fill")
public class BmsEnterpriseFillController extends BaseController {
@Autowired
private IBmsEnterpriseFillService iBmsEnterpriseFillService;
/**
* 企业填报
*/
@PreAuthorize("@ss.hasAnyRoles('ent')")
@ApiOperation(value = "企业填报")
@PostMapping
public AjaxResult add(@RequestBody @Valid EnterpriseFillResquest enterpriseFillResquest) {
return toAjax(iBmsEnterpriseFillService.add(enterpriseFillResquest));
}
//企业填报之后要新增一条审批记录
//政务端审批之后也要新增一条
//被驳回之后也要新增一条审批记录
/**
* 初审驳回之后企业重新填报的接口
*/
@PreAuthorize("@ss.hasAnyRoles('ent')")
@ApiOperation(value = "初审驳回之后企业重新填报的接口")
@PostMapping("/update")
public AjaxResult update(@RequestBody EnterpriseFillResquest enterpriseFillResquest) {
iBmsEnterpriseFillService.update(enterpriseFillResquest);
return success();
}
/**
* 上传文件
*/
@PreAuthorize("@ss.hasAnyRoles('ent')")
@ApiOperation(value = "上传文件")
@PostMapping("/uploadFile")
public AjaxResult uploadFile(@RequestBody EnterpriseFileResquest req) {
iBmsEnterpriseFillService.uploadFile(req);
return success();
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsOpenInterfaceController.java
Unescape View File

@ -30,11 +30,11 @@ public class BmsOpenInterfaceController extends BaseController {
@Autowired
private IOpenInterfaceService iOpenInterfaceService;
@GetMapping("/enterpriseInfo/{creditCode}")
public AjaxResult enterpriseInfo(@PathVariable("creditCode") String creditCode) {
EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = iOpenInterfaceService.enterpriseList(creditCode);
return success(enterpriseInfoTemplateVo);
}
// @GetMapping("/enterpriseInfo/{creditCode}")
// public AjaxResult enterpriseInfo(@PathVariable("creditCode") String creditCode) {
// EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = iOpenInterfaceService.enterpriseList(creditCode);
// return success(enterpriseInfoTemplateVo);
// }
@Log(title = "新增申报记录", businessType = BusinessType.INSERT)
@PostMapping

49
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java
Unescape View File

@ -1,31 +1,22 @@
package com.ruoyi.jjh.declaration.controller;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
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.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
/**
@ -47,10 +38,8 @@ public class BmsTemplateInfoController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/list")
@ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class)
public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) {
startPage();
List<BmsTemplateInfoQueryVo> list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo);
return getDataTable(list);
public AjaxResult list(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo) {
return success(bmsTemplateInfoService.selectBmsTemplateInfoList(page,bmsTemplateInfo));
}
/**
@ -58,7 +47,7 @@ public class BmsTemplateInfoController extends BaseController {
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/allList")
@ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfoQueryVo.class)
@ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfo.class)
public AjaxResult allList(BmsTemplateInfo bmsTemplateInfo) {
bmsTemplateInfo.setStatus(1);
bmsTemplateInfo.setIsDeleted(0);
@ -72,13 +61,17 @@ public class BmsTemplateInfoController extends BaseController {
@Log(title = "申报模板信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BmsTemplateInfo bmsTemplateInfo) {
List<BmsTemplateInfoQueryVo> list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo);
ExcelUtil<BmsTemplateInfoQueryVo> util = new ExcelUtil<BmsTemplateInfoQueryVo>(BmsTemplateInfoQueryVo.class);
List<BmsTemplateInfo> list = bmsTemplateInfoService.selectBmsTemplateInfoList(bmsTemplateInfo);
ExcelUtil<BmsTemplateInfo> util = new ExcelUtil<>(BmsTemplateInfo.class);
util.exportExcel(response, list, "申报模板信息数据");
}
/**
* 导出模板表单
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "导出模板表单", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出模板表单")
@GetMapping(value = "/exportTemplate/{id}")
public void exportTemplate(HttpServletRequest request, HttpServletResponse response,@PathVariable("id")Long id){
bmsTemplateInfoService.exportTemplate(request,response,id);
@ -89,25 +82,28 @@ public class BmsTemplateInfoController extends BaseController {
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@GetMapping(value = "/{id}")
@ApiOperation(value = "获取申报模板信息详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bmsTemplateInfoService.getById(id));
return success(bmsTemplateInfoService.selectByIdOne(id));
}
/**
* 新增申报模板信息
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.INSERT)
@Log(title = "新增申报模板信息", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增申报模板信息")
@PostMapping
public AjaxResult add(@RequestBody BmsTemplateInfo bmsTemplateInfo) {
return toAjax(bmsTemplateInfoService.save(bmsTemplateInfo));
public AjaxResult add(@RequestBody @Valid BmsTemplateInfo bmsTemplateInfo) {
return toAjax(bmsTemplateInfoService.add(bmsTemplateInfo));
}
/**
* 修改申报模板信息
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.UPDATE)
@Log(title = "修改申报模板信息", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改申报模板信息")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) {
return toAjax(bmsTemplateInfoService.updateById(bmsTemplateInfo));
@ -118,6 +114,7 @@ public class BmsTemplateInfoController extends BaseController {
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除申报模板信息")
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsTemplateInfoService.deleteBmsTemplateInfoByIds(ids));

29
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java
Unescape View File

@ -38,27 +38,27 @@ public class BmsTemplateRecordController extends BaseController {
private IBmsTemplateRecordService bmsTemplateRecordService;
/**
* 查询在线模板列表
* 分页查询在线模板列表
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/list")
@ApiOperation(value = "查询在线模板记录列表",response = BmsTemplateRecordQueryVo.class)
@ApiOperation(value = "分页查询在线模板列表",response = BmsTemplateRecordQueryVo.class)
public AjaxResult list(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
return success(bmsTemplateRecordService.selectBmsTemplateRecordList(page,bmsTemplateRecordQueryDto));
}
/**
* 企业端选择表单模板列表
* @param bmsTemplateQueryDto
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "企业端选择表单模板列表")
@GetMapping("/templateNameList")
public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){
List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateNameList(bmsTemplateQueryDto);
return getDataTable(list);
}
// /**
// * 企业端选择表单模板列表
// * @param bmsTemplateQueryDto
// * @return
// */
// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
// @ApiOperation(value = "企业端选择表单模板列表")
// @GetMapping("/templateNameList")
// public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){
// List<BmsTemplateRecordQueryVo> list = bmsTemplateRecordService.selectBmsTemplateNameList(bmsTemplateQueryDto);
// return getDataTable(list);
// }
/**
@ -108,7 +108,6 @@ public class BmsTemplateRecordController extends BaseController {
}
// /**
// * 修改在线模板
// */

25
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java
Unescape View File

@ -38,7 +38,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
private Long id;
/**
* 项目名称
* 申报任务标题
*/
@ApiModelProperty(value = "申报任务标题")
@Excel(name = "申报任务标题")
@ -61,6 +61,13 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
@ApiModelProperty(value = "企业id")
private Long enterpriseId;
/**
* 详情id：对应详情id
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "详情id：对应详情id")
private Long detailId;
/**
* 年份
*/
@ -81,21 +88,23 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "申报模版id")
private Integer templateId;
private Long templateId;
/**
* 企业的统一社会信用代码
* 对应模板json
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "企业的统一社会信用代码")
private String creditCode;
@ApiModelProperty(value = "对应模板json")
private String templateJson;
/**
* 详情id：对应详情id
* 企业的统一社会信用代码
*/
@JSONField(serialize = false)
@ApiModelProperty(value = "详情id：对应详情id")
private Long detailId;
@ApiModelProperty(value = "企业的统一社会信用代码")
private String creditCode;
/**

37
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateInfo.java
Unescape View File

@ -11,6 +11,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
/**
@ -32,6 +34,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 模板名称
*/
@NotBlank
@ApiModelProperty(value = "模板名称")
@Excel(name = "模板名称")
private String templateName;
@ -40,6 +43,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 级别 0:本级,1:省级
*/
@NotNull
@ApiModelProperty(value = "级别 0:本级,1:省级")
@Excel(name = "级别 ", readConverterExp = "0=本级,1=省级")
private Long level;
@ -49,6 +53,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
* 项目大类 1.总部经济 2自主品牌先进技术研究院 3省现代服务业重点项目 4省市服务业领军企业
* 5.省级现代服务业集聚区 6两业融合试点单位 7楼宇经济 8工业设计中心 9工业设计研究院 10服务型制造示范
*/
@NotNull
@ApiModelProperty(value = "项目大类 1.总部经济 2自主品牌先进技术研究院 3省现代服务业重点项目 4省市服务业领军企业 5.省级现代服务业集聚区 6两业融合试点单位 7楼宇经济 8工业设计中心 9工业设计研究院 10服务型制造示范")
@Excel(name = "项目大类 ", readConverterExp = "1=总部经济,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
"5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造示范")
@ -57,6 +62,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 项目中类
*/
@NotNull
@ApiModelProperty(value = "项目中类 1=总部企业,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
" 5=省级现代服务业集聚区,6=两业融合试点单位,7=楼宇经济,8=工业设计中心,9=工业设计研究院,10=服务型制造企业,11=服务型制造平台,12=服务型制造示范项目")
@Excel(name = "项目中类 ", readConverterExp = "1=总部企业,2=自主品牌先进技术研究院,3=省现代服务业重点项目,4=省市服务业领军企业," +
@ -66,6 +72,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 项目小类
*/
@NotNull
@ApiModelProperty(value = "项目小类")
@Excel(name = "项目小类 ", readConverterExp = "1=省级总部,2=市级总部,3=区级总部,4=自主品牌先进技术研究院,5=省现代服务业重点项目,6=省级服务业领军," +
"7=市级服务业领军，8=省级现代服务业集聚区,9=两业融合试点单位,10=楼宇经济,11=国家级工业设计中心,12=省级工业设计中心,13=市级工业设计中心," +
@ -74,16 +81,17 @@ public class BmsTemplateInfo extends BaseInfoEntity {
private Integer projectSmallType;
/**
* 表单说明
*/
@ApiModelProperty(value = "表单说明")
@Excel(name = "表单说明")
private String notes;
// /**
// * 表单说明
// */
// @ApiModelProperty(value = "表单说明")
// @Excel(name = "表单说明")
// private String notes;
/**
* 责任单位 0：经发委:1：规建委:2：行审局:3：市监局
*/
@NotNull
@ApiModelProperty(value = "责任单位 0：经发委:1：规建委:2：行审局:3：市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Integer responsibilityUnit;
@ -98,6 +106,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 模板有效期开始日期
*/
@NotNull
@Excel(name = "模板有效期开始日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ -107,6 +116,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 模板有效期结束日期
*/
@NotNull
@Excel(name = "模板有效期结束日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ -119,4 +129,19 @@ public class BmsTemplateInfo extends BaseInfoEntity {
@Excel(name = "状态 0=过期,1=有效" , readConverterExp = "0=过期,1=有效")
@ApiModelProperty("状态 0=过期,1=有效")
private Integer status;
//==============================
/**
* 模板json
*/
@NotBlank
@ApiModelProperty("模板json")
private String templateJson;
// /**
// * 表名
// */
// @ApiModelProperty("表名")
// private String tableName;
}

12
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java
Unescape View File

@ -65,12 +65,12 @@ public class BmsTemplateRecord extends BaseInfoEntity {
@Excel(name = "申报途径 0:系统申报；1:补录")
private Long road;
/**
* 说明
*/
@Excel(name = "说明")
@Size(max = 200, message = "说明的长度要小于 200")
private String notes;
// /**
// * 说明
// */
// @Excel(name = "说明")
// @Size(max = 200, message = "说明的长度要小于 200")
// private String notes;
/**
* 状态 0=未开始 1=过期 2=有效 3长期有效

34
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java
Unescape View File

@ -8,13 +8,9 @@ import java.util.Date;
import java.util.List;
/**
* <p>
* 审核申报记录查询
* <p>
*
* @className: ApprovalDeclarationRecordsQueryDto
* @author: emiya.xie
* @create: 2023-09-09 15:07
* @author du
* @since 2024/7/24 13:43
*/
@Data
public class ApprovalDeclarationRecordsQueryDto implements Serializable {
@ -24,23 +20,23 @@ public class ApprovalDeclarationRecordsQueryDto implements Serializable {
@ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory;
@ApiModelProperty(value = "事项")
private String matter;
// @ApiModelProperty(value = "事项")
// private String matter;
@ApiModelProperty(value = "项目名称")
private String projectName;
// @ApiModelProperty(value = "项目名称")
// private String projectName;
@ApiModelProperty(value = "项目类型：也就是产品领域")
private Integer productArea;
// @ApiModelProperty(value = "项目类型：也就是产品领域")
// private Integer productArea;
@ApiModelProperty(value = "申报单位")
private String enterpriseName;
@ApiModelProperty(value = "申报单位ID")
private Long enterpriseId;
// @ApiModelProperty(value = "申报单位ID")
// private Long enterpriseId;
@ApiModelProperty(value = "扶持方式")
private Integer supportMethods;
// @ApiModelProperty(value = "扶持方式")
// private Integer supportMethods;
@ApiModelProperty(value = "项目开始时间")
private Date startTime;
@ -51,12 +47,12 @@ public class ApprovalDeclarationRecordsQueryDto implements Serializable {
@ApiModelProperty(value = "审核状态")
private Integer status;
@ApiModelProperty(value = "用户id")
private List<Long> userIds;
// @ApiModelProperty(value = "用户id")
// private List<Long> userIds;
@ApiModelProperty(value = "审批部门")
private Long approvalDept;
@ApiModelProperty(value = "审批状态集合")
@ApiModelProperty(value = "审批状态集合 ,1=初审中,2=复审中,3=终审中,")
private List<Integer> approvalStatusStr;
}

6
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsApprovalInfoUpdateDto.java
Unescape View File

@ -19,9 +19,7 @@ import java.io.Serializable;
public class BmsApprovalInfoUpdateDto implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 申报记录id */
@Excel(name = "申报记录id")
@ -40,7 +38,5 @@ public class BmsApprovalInfoUpdateDto implements Serializable {
@Excel(name = "审批附件")
private String approvalAttachment;
@Excel(name = "排序")
private Integer sort;
}

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsTemplateRecordAddDto.java
Unescape View File

@ -20,6 +20,8 @@ public class BmsTemplateRecordAddDto extends BmsTemplateRecord {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "企业名录")
@ApiModelProperty(value = "企业名录列表")
private List<BmsEnterpriseDirectory> enterpriseDirectoryList;
}

33
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseFileResquest.java
Unescape View File

@ -0,0 +1,33 @@
package com.ruoyi.jjh.declaration.entity.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 企业填报文件请求体
* @author du
* @since 2024/7/24 13:48
*/
@Data
@ApiModel("企业填报请求体")
public class EnterpriseFileResquest {
/**
* 在线申报记录id
*/
@NotNull
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
/**
* 对应模板json
*/
@NotBlank
@ApiModelProperty(value = "对应模板json")
private String templateJson;
}

49
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseFillResquest.java
Unescape View File

@ -0,0 +1,49 @@
package com.ruoyi.jjh.declaration.entity.request;
import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 企业填报请求体
* @author du
* @since 2024/7/24 13:48
*/
@Data
@ApiModel("企业填报请求体")
public class EnterpriseFillResquest {
/**
* 在线申报记录id
*/
@NotNull
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
/**
* 对应模板json
*/
@NotBlank
@ApiModelProperty(value = "对应模板json")
private String templateJson;
/**
* 企业统一信用代码
*/
@NotBlank
@ApiModelProperty(value = "企业统一信用代码")
private String creditCode;
/**
* 在线申报模版id
*/
@NotNull
@ApiModelProperty(value = "在线申报模版id")
private Long templateRecordId;
}

1
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseInfoWorkRequest.java
Unescape View File

@ -1,6 +1,5 @@
package com.ruoyi.jjh.declaration.entity.request;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

15
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/ApprovalDeclarationRecordsQueryVo.java
Unescape View File

@ -20,7 +20,7 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
// private Long id;
@ApiModelProperty(value = "申报任务标题")
private String enterpriseDirectory;
@ -34,8 +34,8 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable {
@ApiModelProperty(value = "审批状态(0=待审核.1=审批通过,2=审批驳回)")
private Integer approvalStatus;
@ApiModelProperty(value = "事项")
private String matter;
// @ApiModelProperty(value = "事项")
// private String matter;
// @ApiModelProperty(value = "项目名称")
// private String projectName;
@ -73,9 +73,10 @@ public class ApprovalDeclarationRecordsQueryVo implements Serializable {
@ApiModelProperty(value = "记录id")
private Long declarationRecordsId;
@ApiModelProperty(value = "详情id")
private Long detailId;
@ApiModelProperty(value = "审批时间")
private Date approvalTime;
// @ApiModelProperty(value = "详情id")
// private Long detailId;
// @ApiModelProperty(value = "审批时间")
// private Date approvalTime;
}

9
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java
Unescape View File

@ -1,5 +1,6 @@
package com.ruoyi.jjh.declaration.entity.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
@ -99,4 +100,12 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
@Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审驳回,9=终审不通过，10=退回修改")
private Long status;
/**
* 对应模板json
*/
@ApiModelProperty(value = "对应模板json")
private String templateJson;
}

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsTemplateRecordQueryVo.java
Unescape View File

@ -59,8 +59,8 @@ public class BmsTemplateRecordQueryVo implements Serializable {
@Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
@Excel(name = "说明")
private String notes;
// @Excel(name = "说明")
// private String notes;
@ApiModelProperty(value = "责任单位 0：经发委:1：规建委:2：行审局:3：市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")

25
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/DeclarationRecordsVo.java
Unescape View File

@ -28,29 +28,4 @@ public class DeclarationRecordsVo implements Serializable {
private BmsDeclarationRecords bmsDeclarationRecords;
@ApiModelProperty(value = "企业基础信息对象")
private BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo;
@ApiModelProperty(value = "1、项目落户奖补对象")
private BmsProjectSettlementAwardQueryVo bmsProjectSettlementAwardQueryVo;
@ApiModelProperty(value = "2、做大做强奖详情对象")
private BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo;
@ApiModelProperty(value = "3、载体建设奖补对象")
private BmsCarrierConstructionAward bmsCarrierConstructionAward;
@ApiModelProperty(value = "4、平台建设奖补对象")
private BmsPlatformConstructionAward bmsPlatformConstructionAward;
@ApiModelProperty(value = "5、品牌打造奖补对象")
private BmsBrandingAward bmsBrandingAward;
@ApiModelProperty(value = "6、场景开放奖补对象")
private BmsSceneOpeningAward bmsSceneOpeningAward;
@ApiModelProperty(value = "7、信用管理奖补对象")
private BmsCreditManagement bmsCreditManagement;
@ApiModelProperty(value = "8、5G+工业互联网奖补对象")
private BmsIndustrialInternetAward bmsIndustrialInternetAward;
@ApiModelProperty(value = "9、制造服务业有效投入奖补对象")
private BmsManufacturingServicesAward bmsManufacturingServicesAward;
@ApiModelProperty(value = "10、物流发展奖补对象")
private BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward;
@ApiModelProperty(value = "11、两业融合奖补对象")
private BmsIntegrationIndustries bmsIntegrationIndustries;
@ApiModelProperty(value = "12、2024年度淘汰落后和退出低端低效产能装备清单对象")
private BmsOutQuitProducts bmsOutQuitProducts;
}

7
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsDeclarationRecordsMapper.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto;
@ -38,8 +39,11 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
public List<BmsDeclarationRecordsQueryVo> selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto);
public List<BmsMunicipalBureauReviewQueryVo> selectMunicipalBureauReviewList();
/**
* 审核列表
*
*/
public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto);
/**
@ -105,4 +109,5 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
* @return
*/
JProject getAddProject(Long id);
}

25
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateInfoMapper.java
Unescape View File

@ -1,8 +1,9 @@
package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -20,14 +21,30 @@ public interface BmsTemplateInfoMapper extends BaseMapper<BmsTemplateInfo> {
* @param bmsTemplateInfo 申报模板信息
* @return 申报模板信息集合
*/
public List<BmsTemplateInfoQueryVo> templateInfoList(BmsTemplateInfo bmsTemplateInfo);
Page<BmsTemplateInfo> templateInfoList(Page<BmsTemplateInfo> page,@Param("req") BmsTemplateInfo bmsTemplateInfo);
/**
* 新增项目时查询所有模板信息
*
* @param bmsTemplateInfo 申报模板信息
* @return 申报模板信息集合
*/
List<BmsTemplateInfo> templateInfoList(@Param("req") BmsTemplateInfo bmsTemplateInfo);
/**
* 查询单个模板
*
* @return 结果
*/
BmsTemplateInfo selectByIdOne(Long ids);
/**
* 删除申报模板信息
*
* @param id 申报模板信息主键
* @return 结果
*/
public int deleteBmsTemplateInfoById(Long id);
int deleteBmsTemplateInfoById(Long id);
/**
* 批量删除申报模板信息
@ -35,5 +52,5 @@ public interface BmsTemplateInfoMapper extends BaseMapper<BmsTemplateInfo> {
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteBmsTemplateInfoByIds(Long[] ids);
int deleteBmsTemplateInfoByIds(Long[] ids);
}

50
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsTemplateRecordMapper.java
Unescape View File

@ -18,39 +18,22 @@ import java.util.List;
* @date 2023-09-07
*/
public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
/**
* 查询在线模板
*
* @param id 在线模板主键
* @return 在线模板
* 获取在线模板详细信息
*/
public BmsTemplateRecord selectBmsTemplateRecordById(Long id);
public BmsTemplateRecordVo selectBmsTemplateRecordVoById(Long id);
/**
* 查询在线模板列表
*
* @param bmsTemplateRecord 在线模板
* @return 在线模板集合
*/
public List<BmsTemplateRecord> selectBmsTemplateRecordList(BmsTemplateRecord bmsTemplateRecord);
/**
* 新增在线模板
*
* @param bmsTemplateRecord 在线模板
* @return 结果
* 导出查询所有在线模板列表
*
* @param bmsTemplateRecordQueryDto 在线模板
* @return 在线模板
*/
public int insertBmsTemplateRecord(BmsTemplateRecord bmsTemplateRecord);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
/**
* 修改在线模板
*
* @param bmsTemplateRecord 在线模板
* @return 结果
*/
public int updateBmsTemplateRecord(BmsTemplateRecord bmsTemplateRecord);
/**
* 删除在线模板
@ -68,11 +51,20 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
*/
public int deleteBmsTemplateRecordByIds(Long[] ids);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public Page<BmsTemplateRecordQueryVo> selectTemplateRecordVo(Page<BmsTemplateRecordQueryVo> page,@Param("req")BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(@Param("creditCode") String creditCode);
/**
* 分页查询在线模板列表
*
* @param bmsTemplateRecordQueryDto 在线模板
* @return 在线模板集合
*/
public Page<BmsTemplateRecordQueryVo> selectTemplateRecordVo(Page<BmsTemplateRecordQueryVo> page,@Param("req")BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto);
// /**
// * 企业端选择表单模板列表
// * @param bmsTemplateQueryDto
// * @return
// */
// public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto);
}

15
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java
Unescape View File

@ -105,6 +105,12 @@ public class TimeChange {
@Resource
private SysUserMapper sysUserMapper;
/**
* 申报模板
*/
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource
private TimingRemindService timingRemindImpl;
@ -114,15 +120,8 @@ public class TimeChange {
@Scheduled(cron = "1 0 0 * * *")
private void configureTasks() {
List<BmsTemplateInfo> list = bmsTemplateInfoService.list();
LocalDate currentDate = LocalDate.now();
for (BmsTemplateInfo items : list) {
LocalDate startDate = LocalDate.of(items.getUseStart().getYear(), items.getUseStart().getMonth(), items.getUseStart().getDayOfMonth());
LocalDate endDate = LocalDate.of(items.getUseEnd().getYear(), items.getUseEnd().getMonth(), items.getUseEnd().getDayOfMonth());
if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) {
items.setStatus(1);
} else {
items.setStatus(0);
}
iBmsTemplateInfoService.changeStatus(items);
}
bmsTemplateInfoService.updateBatchById(list);
}

20
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsDeclarationRecordsService.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.*;
import com.ruoyi.jjh.ent.entity.JProject;
@ -38,11 +39,13 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
public List<BmsDeclarationRecordsQueryVo> selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto);
public List<BmsMunicipalBureauReviewQueryVo> selectMunicipalBureauReviewList();
/**
* 审核列表
*
*/
public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto);
public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto);
public int updateApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto);
@ -63,17 +66,6 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
*/
public int updateBmsDeclarationRecords(BmsDeclarationRecords bmsDeclarationRecords);
/**
* 市级评定确认
*
* @param municipalReviewDto
* @return {@link int}
* @author emiya.xie
* @create 2023/9/13 17:18
*/
public int municipalReview(MunicipalReviewDto municipalReviewDto);
public int municipalReviewNew(MunicipalReviewDto municipalReviewDto);
/**
* 批量删除在线申报记录
@ -96,7 +88,7 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
/**
* 根据id集合压缩所有文件使用类
*/
String getAllFile(Long args,Long id);
List<String> getAllFile(String a);
/**
* 根据企业id和模板id查询

37
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseFillService.java
Unescape View File

@ -0,0 +1,37 @@
package com.ruoyi.jjh.declaration.service;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest;
import org.springframework.web.multipart.MultipartFile;
import java.util.Map;
/**
* 企业填报业务层
* @author du
* @since 2024/7/24 13:52
*/
public interface IBmsEnterpriseFillService {
/**
* 企业填报
*/
Boolean add(EnterpriseFillResquest enterpriseFillResquest);
/**
* 解析模板json
*/
Map<String,String> parseJson(String json);
/**
* 初审驳回之后企业重新填报的接口
*/
void update(EnterpriseFillResquest enterpriseFillResquest);
/**
* 上传文件
*/
void uploadFile(EnterpriseFileResquest req);
}

28
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateInfoService.java
Unescape View File

@ -1,8 +1,8 @@
package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -23,7 +23,15 @@ public interface IBmsTemplateInfoService extends IService<BmsTemplateInfo> {
* @param bmsTemplateInfo 申报模板信息
* @return 申报模板信息集合
*/
public List<BmsTemplateInfoQueryVo> selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo);
public Page<BmsTemplateInfo> selectBmsTemplateInfoList(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo);
/**
* 新增项目时查询所有模板信息
*
* @param bmsTemplateInfo 申报模板信息
* @return 申报模板信息集合
*/
public List<BmsTemplateInfo> selectBmsTemplateInfoList( BmsTemplateInfo bmsTemplateInfo);
/**
* 导出模板表单
@ -38,6 +46,22 @@ public interface IBmsTemplateInfoService extends IService<BmsTemplateInfo> {
public void exportTemplate(HttpServletRequest request, HttpServletResponse response, Long id);
/**
* 新增申报模板
*/
Boolean add(BmsTemplateInfo bmsTemplateInfo);
/**
* 查询单个模板
*/
BmsTemplateInfo selectByIdOne(Long id);
/**
* 修改申报模板的状态
*/
void changeStatus(BmsTemplateInfo bmsTemplateInfo);
/**
* 批量删除申报模板信息
*

51
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsTemplateRecordService.java
Unescape View File

@ -19,35 +19,55 @@ import java.util.List;
* @date 2023-09-07
*/
public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
/**
* 查询在线模板
*
* @param id 在线模板主键
* @return 在线模板
*/
public BmsTemplateRecordVo selectBmsTemplateRecordById(Long id);
/**
* 查询在线模板列表
*
* 分页查询在线模板列表
*
* @param bmsTemplateRecordQueryDto 在线模板
* @return 在线模板集合
*/
public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
// /**
// * 企业端选择表单模板列表
// * @param bmsTemplateQueryDto
// * @return
// */
// public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto);
/**
* 补录
* @param bmsTemplateRecordAddDto
* @return
*/
int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordAddDto);
/**
* 导出查询所有在线模板列表
*
* @param bmsTemplateRecordQueryDto 在线模板
* @return 在线模板
*/
public List<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(String creditCode);
/**
* 获取在线模板详细信息
*/
public BmsTemplateRecordVo selectBmsTemplateRecordById(Long id);
public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto);
/**
* 新增在线模板
*
*
* @param bmsTemplateRecordAddDto 在线模板
* @return 结果
*/
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto);
// /**
// * 修改在线模板
// *
@ -72,10 +92,5 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
*/
public int deleteBmsTemplateRecordById(Long id);
/**
* 补录
* @param bmsTemplateRecordAddDto
* @return
*/
int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordAddDto);
}

11
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/ICommonService.java
Unescape View File

@ -23,21 +23,10 @@ public interface ICommonService {
public void checkEnterprise(Long enterpriseId,Long templateId);
public void getData(int templateRecordId, Long detailId, DeclarationRecordsVo declarationRecordsVo);
public void insertProcessInfo(Long declarationRecordId,Integer approvalType);
public void insertAuditRecord(Long declarationRecordId,Integer approvalType);
public void updateAuditRecord(Long declarationRecordId,Integer approvalType);
public void cleanProcessList(Long declarationRecordId);
public List<Long> getUserIds(Long userId);
public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto);
public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto);
}

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IOpenInterfaceService.java
Unescape View File

@ -16,7 +16,7 @@ import com.ruoyi.jjh.declaration.entity.vo.EnterpriseInfoTemplateVo;
*/
public interface IOpenInterfaceService {
public EnterpriseInfoTemplateVo enterpriseList(String creditCode);
// public EnterpriseInfoTemplateVo enterpriseList(String creditCode);
public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto);

458
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java
Unescape View File

@ -2,10 +2,13 @@ package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.context.SecurityContextHolder;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.declaration.component.TimingRemindService;
@ -20,16 +23,14 @@ import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import com.ruoyi.jjh.ent.service.JProjectService;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -142,30 +143,20 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
@Override
public DeclarationRecordsVo selectBmsDeclarationRecordsById(Long id) {
// 获取申请记录
BmsDeclarationRecords declarationRecords = baseMapper.selectBmsDeclarationRecordsById(id);
BmsDeclarationRecords declarationRecords = getById(id);
DeclarationRecordsVo declarationRecordsVo = new DeclarationRecordsVo();
declarationRecordsVo.setBmsDeclarationRecords(declarationRecords);
// 在线模板记录id
int declarationTemplateType = declarationRecords.getTemplateId();
// 详情id
Long detailId = declarationRecords.getDetailId();
// 企业的统一社会信用代码
String creditCode = declarationRecords.getCreditCode();
// 获取详情数据
iCommonService.getData(declarationTemplateType, detailId, declarationRecordsVo);
Long declarationTemplateType = declarationRecords.getTemplateId();
//企业基本信息
QueryWrapper<BmsEnterpriseBasicInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("tyshxydm", creditCode);
queryWrapper.eq("tyshxydm", declarationRecords.getCreditCode());
BmsEnterpriseBasicInfo one = iBmsEnterpriseBasicInfoService.getOne(queryWrapper);
declarationRecordsVo.setBmsEnterpriseBasicInfo(one);
declarationRecordsVo.setApprovalInfoList(iBmsApprovalInfoService.getApprovalInfoList(id));
BmsTemplateRecord items = iBmsTemplateRecordService.getById(declarationRecords.getTemplateRecordId());
//获取申报任务标题
declarationRecordsVo.setEnterpriseDirectory( items.getEnterpriseDirectory() );
declarationRecordsVo.setEnterpriseDirectory(items.getEnterpriseDirectory());
return declarationRecordsVo;
}
@ -186,10 +177,6 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
return baseMapper.selectBmsDeclarationRecordsZwList(bmsDeclarationRecordsDto);
}
@Override
public List<BmsMunicipalBureauReviewQueryVo> selectMunicipalBureauReviewList() {
return baseMapper.selectMunicipalBureauReviewList();
}
/**
* 审核列表
@ -201,107 +188,56 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
*/
@Override
public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) {
// approvalDeclarationRecordsQueryDto.setUserIds(iCommonService.getUserIds(SecurityContextHolder.getUserId()));
if (SecurityUtils.getUserId().equals(1L)) {
approvalDeclarationRecordsQueryDto.setApprovalDept(null);
} else {
// todo SecurityContextHolder.getUserId()失效换成SecurityUtils.getUserId()
approvalDeclarationRecordsQueryDto.setApprovalDept(SecurityUtils.getDeptId());
}
return baseMapper.approvalList(approvalDeclarationRecordsQueryDto);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) {
Boolean flag = false;
List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByAsc(BmsApprovalInfo::getSort).list();
AtomicReference<Long> processId = new AtomicReference<>(0L);
if (CollectionUtil.isNotEmpty(approvalInfoList)) {
approvalInfoList.forEach(x -> {
if (x.getIsReview().equals(0)) {
bmsApprovalInfoUpdateDto.setId(x.getId());
bmsApprovalInfoUpdateDto.setSort(x.getSort());
BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x);
x.setApprovalById(SecurityContextHolder.getUserId());
x.setApprovalTime(DateUtils.getNowDate());
processId.set(x.getProcessId());
}
});
approvalInfoList.forEach(x -> {
if ((bmsApprovalInfoUpdateDto.getSort() + 1) == x.getSort()) {
x.setIsReview(0);
}
});
flag = iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoList);
approval(bmsApprovalInfoUpdateDto, processId.get());
}
if (!flag) {
return 0;
}
return 1;
}
@Override
@Transactional(rollbackFor = Exception.class)
public int updateApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) {
// 新增审核记录，修改申报记录状态
List<BmsProcessInfo> bmsProcessInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, 0).list();
BmsProcessInfo bmsProcessInfo = new BmsProcessInfo();
bmsProcessInfoList.forEach(x -> {
// boolean flag = Arrays.asList(x.getApprovalByIds().split(",")).contains(String.valueOf(SecurityUtils.getUserId()));
if (Objects.equals(x.getApprovalDept(), SecurityUtils.getDeptId())) {
BeanUtil.copyProperties(x, bmsProcessInfo);
}
});
// 审批记录
List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByDesc(BmsApprovalInfo::getSort).list();
// 更新审批记录
if (CollectionUtil.isNotEmpty(approvalInfoList)) {
for (BmsApprovalInfo x : approvalInfoList) {
if (bmsProcessInfo.getId().equals(x.getProcessId())) {
// 更新审批记录
Integer sort = x.getSort();
bmsApprovalInfoUpdateDto.setId(x.getId());
BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x);
x.setSort(sort);
x.setApprovalById(SecurityUtils.getUserId());
x.setApprovalDept(SecurityUtils.getDeptId());
x.setApprovalTime(DateUtils.getNowDate());
x.setIsReview(2);
x.setApprovalStatus(bmsApprovalInfoUpdateDto.getApprovalStatus());
iBmsApprovalInfoService.updateById(x);
}
}
}
// 新增记录
if (bmsApprovalInfoUpdateDto.getApprovalStatus().equals(1)) {
BmsProcessInfo bmsProcessInfo2 = new BmsProcessInfo();
bmsProcessInfoList.forEach(x -> {
if (x.getId().equals(bmsProcessInfo.getNextProcessId())) {
BeanUtil.copyProperties(x, bmsProcessInfo2);
}
});
if (BeanUtil.isNotEmpty(bmsProcessInfo2)) {
BmsApprovalInfo bmsApprovalInfo = new BmsApprovalInfo();
bmsApprovalInfo.setProcessId(bmsProcessInfo2.getId());
bmsApprovalInfo.setDeclarationRecordsId(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
bmsApprovalInfo.setApprovalById(bmsProcessInfo2.getApprovalById());
bmsApprovalInfo.setApprovalDept(bmsProcessInfo2.getApprovalDept());
bmsApprovalInfo.setApprovalStatus(0);
bmsApprovalInfo.setSort(approvalInfoList.size() + 1);
iBmsApprovalInfoService.saveOrUpdate(bmsApprovalInfo);
}
List<BmsApprovalInfo> list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByDesc(BmsApprovalInfo::getSort).list();
BmsApprovalInfo ba = list.get(0);
// 如果当前的deptId和最新一条的审批记录一样的话
if(ba.getApprovalStatus()!=0 || !Objects.equals(ba.getApprovalDept(), SecurityUtils.getDeptId())){
throw new ServiceException("无法审批!");
}else {
ba.setId(null);
ba.setApprovalById(SecurityUtils.getUserId());
ba.setApprovalStatus(bmsApprovalInfoUpdateDto.getApprovalStatus());
ba.setApprovalOpinions(bmsApprovalInfoUpdateDto.getApprovalOpinions());
ba.setApprovalAttachment(bmsApprovalInfoUpdateDto.getApprovalAttachment());
ba.setSort(list.size() + 1);
iBmsApprovalInfoService.save(ba);
}
// 更新记录状态
int num = approval(bmsApprovalInfoUpdateDto, bmsProcessInfo);
int num = approval(bmsApprovalInfoUpdateDto, ba.getProcessId(),list.size() + 1);
return num;
}
public int approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, BmsProcessInfo bmsProcessInfo) {
public int approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, Long id, Integer a) {
//获取审批之前的流程
BmsProcessInfo bmsProcessInfo = iBmsProcessInfoService.getById(id);
if(bmsApprovalInfoUpdateDto.getApprovalStatus()==1){
//根据审批之前的流程获取下一个流程id的详情数据
if(bmsProcessInfo.getNextProcessId()!=0){
BmsProcessInfo newBmsProcessInfo = iBmsProcessInfoService.getById(bmsProcessInfo.getNextProcessId());
BmsApprovalInfo ar = new BmsApprovalInfo();
ar.setProcessId(bmsProcessInfo.getNextProcessId());
ar.setDeclarationRecordsId(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
ar.setApprovalStatus(0);
ar.setApprovalDept(newBmsProcessInfo.getApprovalDept());
ar.setSort(a + 1);
ar.setIsReview(0);
iBmsApprovalInfoService.save(ar);
}
}
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
BmsEnterpriseBasicInfo one = iBmsEnterpriseBasicInfoService.lambdaQuery().eq(BmsEnterpriseBasicInfo::getTyshxydm,bmsDeclarationRecords.getCreditCode()).one();
BmsEnterpriseBasicInfo one = iBmsEnterpriseBasicInfoService.lambdaQuery().eq(BmsEnterpriseBasicInfo::getTyshxydm, bmsDeclarationRecords.getCreditCode()).one();
JProject jp = new JProject();
jp.setId(bmsDeclarationRecords.getJjhProjectId());
if (bmsProcessInfo.getApprovalLevel().equals(0)) {
@ -309,15 +245,15 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
jp.setStatus(2);
bmsDeclarationRecords.setStatus(2L);
}
if(bmsApprovalInfoUpdateDto.getApprovalStatus() == 2){
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 2) {
jp.setStatus(8);
bmsDeclarationRecords.setStatus(8L);
timingRemindImpl.getContact(one.getTyshxydm(),"您有1个申报任务[初审不通过]");
timingRemindImpl.getContact(one.getTyshxydm(), "您有1个申报任务[初审不通过]");
}
if(bmsApprovalInfoUpdateDto.getApprovalStatus() == 3){
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 3) {
jp.setStatus(10);
bmsDeclarationRecords.setStatus(10L);
timingRemindImpl.getContact(one.getTyshxydm(),"您有1个申报任务[初审退回],待重新填报");
timingRemindImpl.getContact(one.getTyshxydm(), "您有1个申报任务[初审退回],待重新填报");
}
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
@ -326,91 +262,23 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
} else {
jp.setStatus(7);
bmsDeclarationRecords.setStatus(7L);
timingRemindImpl.getContact(one.getTyshxydm(),"您有1个申报任务[复审不通过]");
timingRemindImpl.getContact(one.getTyshxydm(), "您有1个申报任务[复审不通过]");
}
} else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
// if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
// jp.setStatus(4);
// bmsDeclarationRecords.setStatus(4L);
// } else {
// jp.setStatus(6);
// bmsDeclarationRecords.setStatus(6L);
// }
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(5);
bmsDeclarationRecords.setStatus(5L);
timingRemindImpl.getContact(one.getTyshxydm(),"您有1个申报任务[终审通过]");
timingRemindImpl.getContact(one.getTyshxydm(), "您有1个申报任务[终审通过]");
} else {
jp.setStatus(9);
bmsDeclarationRecords.setStatus(9L);
timingRemindImpl.getContact(one.getTyshxydm(),"您有1个申报任务[终审不通过]");
timingRemindImpl.getContact(one.getTyshxydm(), "您有1个申报任务[终审不通过]");
}
}
// else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
// if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
// jp.setStatus(5);
// bmsDeclarationRecords.setStatus(5L);
// } else {
// jp.setStatus(9);
// bmsDeclarationRecords.setStatus(9L);
// }
// }
jProjectService.updateById(jp);
return baseMapper.updateById(bmsDeclarationRecords);
}
/**
* 审批
*
* @param bmsApprovalInfoUpdateDto
* @param processId
* @return
* @author emiya.xie
* @create 2023/9/9 18:22
*/
public void approval(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto, Long processId) {
BmsProcessInfo bmsProcessInfo = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getId, processId).list().get(0);
if (BeanUtil.isNotEmpty(bmsProcessInfo)) {
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(bmsApprovalInfoUpdateDto.getDeclarationRecordsId());
JProject jp = new JProject();
jp.setId(bmsDeclarationRecords.getJjhProjectId());
if (bmsProcessInfo.getApprovalLevel().equals(0)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(2);
bmsDeclarationRecords.setStatus(2L);
} else {
jp.setStatus(8);
bmsDeclarationRecords.setStatus(8L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(1)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(3);
bmsDeclarationRecords.setStatus(3L);
} else {
jp.setStatus(7);
bmsDeclarationRecords.setStatus(7L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(2)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(4);
bmsDeclarationRecords.setStatus(4L);
} else {
jp.setStatus(6);
bmsDeclarationRecords.setStatus(6L);
}
} else if (bmsProcessInfo.getApprovalLevel().equals(3)) {
if (bmsApprovalInfoUpdateDto.getApprovalStatus() == 1) {
jp.setStatus(5);
bmsDeclarationRecords.setStatus(5L);
} else {
jp.setStatus(9);
bmsDeclarationRecords.setStatus(9L);
}
}
jProjectService.updateById(jp);
baseMapper.updateById(bmsDeclarationRecords);
}
}
/**
* 新增在线申报记录
@ -465,164 +333,6 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
return baseMapper.updateBmsDeclarationRecords(bmsDeclarationRecords);
}
/**
* 市级评定结果确认
*
* @param municipalReviewDto
* @return {@link int}
* @author emiya.xie
* @create 2023/9/13 17:21
*/
@Override
public int municipalReview(MunicipalReviewDto municipalReviewDto) {
List<MunicipalReviewInfoDto> list = municipalReviewDto.getList();
// 需要更新的数据
List<BmsDeclarationRecords> reviewrecordsList = new ArrayList<>();
// 统一信用代码、年份、申报类型 -- > 申报记录 -->
// 查询企业数据
List<BmsEnterpriseBasicInfo> enterpriseInfoList = iBmsEnterpriseBasicInfoService.lambdaQuery().list();
Map<String, BmsEnterpriseBasicInfo> enterpriseBasicMap = enterpriseInfoList.stream().collect(Collectors.toMap(BmsEnterpriseBasicInfo::getTyshxydm, Function.identity()));
// 匹配企业
List<Long> enterpriseIdList = new ArrayList<>();
list.forEach(x -> {
if (enterpriseBasicMap.containsKey(x.getCreditCode())) {
x.setEnterpriseId(enterpriseBasicMap.get(x.getCreditCode()).getId());
// 获取对应企业id集合
enterpriseIdList.add(enterpriseBasicMap.get(x.getCreditCode()).getId());
}
// 区分状态
if (x.getResult().equals("通过")) {
x.setStatus(5L);
} else {
x.setStatus(9L);
}
});
//获取对应企业的申报记录
List<BmsDeclarationRecords> recordsList = baseMapper.selectList(Wrappers.lambdaQuery(BmsDeclarationRecords.class).in(BmsDeclarationRecords::getEnterpriseId, enterpriseIdList).eq(BmsDeclarationRecords::getStatus, 4));
if (CollectionUtil.isNotEmpty(recordsList)) {
// 根据条件对比获取记录id
// 记录id集合
List<Long> declarationIdList = new ArrayList<>();
for (BmsDeclarationRecords records : recordsList) {
for (MunicipalReviewInfoDto dto : list) {
if (records.getEnterpriseId().equals(dto.getEnterpriseId()) && records.getYear().equals(dto.getYear()) && records.getProjectName().contains(dto.getDeclarationTypeStr())) {
records.setStatus(dto.getStatus());
dto.setDeclarationId(records.getId());
declarationIdList.add(records.getId());
reviewrecordsList.add(records);
}
}
}
if (CollectionUtil.isNotEmpty(reviewrecordsList)) {
Map<Long, MunicipalReviewInfoDto> reviewInfoMap = list.stream().collect(Collectors.toMap(MunicipalReviewInfoDto::getDeclarationId, Function.identity()));
// 查询审批记录并更新
List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().in(BmsApprovalInfo::getDeclarationRecordsId, declarationIdList).eq(BmsApprovalInfo::getProcessId, 4).eq(BmsApprovalInfo::getApprovalStatus, 0).list();
// 需要更新的审批数据的id
List<Long> recordsIdList = new ArrayList<>();
approvalInfoList.forEach(x -> {
if (reviewInfoMap.containsKey(x.getDeclarationRecordsId())) {
MunicipalReviewInfoDto reviewInfoDto = reviewInfoMap.get(x.getDeclarationRecordsId());
if (reviewInfoDto.getStatus() == 5) {
x.setApprovalStatus(1);
} else {
recordsIdList.add(x.getDeclarationRecordsId());
x.setApprovalStatus(2);
x.setIsBeforeData(1);
}
x.setApprovalOpinions(reviewInfoDto.getResult());
x.setApprovalById(SecurityContextHolder.getUserId());
x.setApprovalTime(DateUtils.getNowDate());
}
});
if (CollectionUtil.isNotEmpty(recordsIdList)) {
iBmsApprovalInfoService.updateApprovalList(recordsIdList);
}
// 批量保存记录
boolean b = this.saveOrUpdateBatch(reviewrecordsList);
// 审查审批记录
iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoList);
}
}
return reviewrecordsList.size();
}
/**
* 市局审批
*
* @param municipalReviewDto
* @return {@link int}
* @author emiya.xie
* @create 2023/9/17 13:59
*/
@Override
public int municipalReviewNew(MunicipalReviewDto municipalReviewDto) {
List<BmsMunicipalBureauReviewQueryDto> reviewList = municipalReviewDto.getReviewList();
// 需要更新的申报记录
List<BmsDeclarationRecords> recordsUpdate = new ArrayList<>();
if (CollectionUtil.isNotEmpty(reviewList)) {
//TODO
// 1、根据导入的申报记录id获取对应数据
// 2、修改申报记录状态，
// 3、更新申报记录对应的审核记录（如果是拒绝，还要修改审核记录的isBeforeData数据状态）
List<Long> ids = reviewList.stream().map(BmsMunicipalBureauReviewQueryDto::getId).collect(Collectors.toList());
// 查询到的申报记录
List<BmsDeclarationRecords> records = baseMapper.selectList(Wrappers.lambdaQuery(BmsDeclarationRecords.class).in(BmsDeclarationRecords::getId, ids).eq(BmsDeclarationRecords::getStatus, 4));
// key ：记录id,形成map
Map<Long, BmsDeclarationRecords> recordsMap = records.stream().collect(Collectors.toMap(BmsDeclarationRecords::getId, Function.identity()));
// 查询审批记录并更新
List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().in(BmsApprovalInfo::getDeclarationRecordsId, ids).eq(BmsApprovalInfo::getProcessId, 4).eq(BmsApprovalInfo::getApprovalStatus, 0).list();
Map<Long, BmsApprovalInfo> approvalMap = approvalInfoList.stream().collect(Collectors.toMap(BmsApprovalInfo::getDeclarationRecordsId, Function.identity()));
// 需要更新的审批记录
List<BmsApprovalInfo> approvalInfoUpdate = new ArrayList<>();
// 需要更新的审批数据的id
List<Long> recordsIdList = new ArrayList<>();
reviewList.forEach(x -> {
if (recordsMap.containsKey(x.getId())) {
BmsDeclarationRecords bmsDeclarationRecords = recordsMap.get(x.getId());
if (x.getResult() == 0) {
bmsDeclarationRecords.setStatus(5L);
} else {
bmsDeclarationRecords.setStatus(9L);
}
recordsUpdate.add(bmsDeclarationRecords);
}
if (approvalMap.containsKey(x.getId())) {
BmsApprovalInfo bmsApprovalInfo = approvalMap.get(x.getId());
if (x.getResult() == 0) {
bmsApprovalInfo.setApprovalStatus(1);
} else {
bmsApprovalInfo.setApprovalStatus(2);
recordsIdList.add(x.getId());
}
bmsApprovalInfo.setApprovalOpinions(x.getOpinion());
bmsApprovalInfo.setApprovalTime(DateUtils.getNowDate());
approvalInfoUpdate.add(bmsApprovalInfo);
}
});
if (CollectionUtil.isNotEmpty(recordsIdList)) {
iBmsApprovalInfoService.updateApprovalList(recordsIdList);
}
for (BmsDeclarationRecords a1 : recordsUpdate) {
JProject jp = new JProject();
jp.setId(a1.getJjhProjectId());
jp.setStatus(Math.toIntExact(a1.getStatus()));
jProjectService.updateById(jp);
}
// 批量保存记录
this.saveOrUpdateBatch(recordsUpdate);
// 审查审批记录
iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoUpdate);
}
return recordsUpdate.size();
}
/**
* 批量删除在线申报记录
@ -647,80 +357,37 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
}
/**
* 根据id集合压缩所有文件使用类
*/
public String getAllFile(Long args,Long id) {
if (args == 1) {
BmsProjectSettlementAward lh = bmsProjectSettlementAwardService.getById(id);
return lh.getAgreement() + "," +
lh.getReport() + "," +
lh.getBusinessLicense() + "," +
lh.getOtherMaterials();
} else if (args == 2) {
BmsBigStrongAward zdzq = bmsBigStrongAwardService.getById(id);
return zdzq.getDevelopmentPlan();
}else if (args == 3) {
BmsCarrierConstructionAward ztjs = bmsCarrierConstructionAwardService.getById(id);
return ztjs.getSupportingMaterials() + "," +
ztjs.getBusinessLicense() + "," +
ztjs.getFireReport();
}else if (args == 4) {
BmsPlatformConstructionAward ptjs = bmsPlatformConstructionAwardService.getById(id);
return ptjs.getAgreement();
}else if (args == 5) {
BmsBrandingAward ppdz = bmsBrandingAwardService.getById(id);
return ppdz.getEvidence();
}else if (args == 6) {
BmsSceneOpeningAward cjkf = bmsSceneOpeningAwardService.getById(id);
return cjkf.getMaterial();
}else if (args == 7) {
BmsCreditManagement xygl = bmsCreditManagementService.getById(id);
return xygl.getProjectPlan() + "," + xygl.getUsesFunds() + "," + xygl.getAuditReport() ;
}else if (args == 8) {
BmsIndustrialInternetAward g5 = bmsIndustrialInternetAwardService.getById(id);
return g5.getMaterial();
}else if (args == 9) {
BmsManufacturingServicesAward zzfw = bmsManufacturingServicesAwardService.getById(id);
return zzfw.getFilingNotice() + "," + zzfw.getInvoice() + "," + zzfw.getAuditReport() + ","+ zzfw.getFinancialStatements() ;
}else if (args == 10) {
BmsLogisticsDevelopmentAward wl = bmsLogisticsDevelopmentAwardService.getById(id);
return wl.getFilingNotice() + "," + wl.getHonorCertificate() + "," + wl.getAuditReport() + ","+ wl.getPlatformName();
}else if (args == 11) {
BmsIntegrationIndustries ly = bmsIntegrationIndustriesService.getById(id);
return ly.getEvidence() + ","+
ly.getBusinessLicense() + "," +
ly.getTaxPaymentCertificate() + "," +
ly.getAuditReport() + "," +
ly.getEquityStructureChart() + "," +
ly.getDeclarationReport() + "," +
ly.getIndependentAccounting() + "," +
ly.getCapitalVerificationReport() + "," +
ly.getOtherEvidence();
}else if (args == 12) {
BmsOutQuitProducts ly = iBmsOutQuitProductsService.getById(id);
return ly.getSpecifics() + ","+
ly.getOtherSpecifics() + ",";
} else {
return null;
public List<String> getAllFile(String a) {
JSONArray js1 = JSONObject.parse(a).getJSONArray("fields");
List<String> strList = new ArrayList<>();
for (Object o : js1) {
JSONObject parse = JSONObject.parse(o.toString());
if ("el-upload".equals(parse.get("tag"))) {
String[] split = parse.get("defaultValue").toString().split(",");
strList.addAll(Arrays.asList(split));
}
}
return strList;
}
/**
* 根据企业id和模板id查询
*
* @return
*/
@Override
public List<BmsDeclarationRecords> selectET(Long templateId, List<String> list) {
return baseMapper.selectET(templateId,list);
return baseMapper.selectET(templateId, list);
}
/**
* 申报模板不限时并且未填报的
*
* @return
*/
@Override
@ -730,10 +397,13 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
/**
* 获取某个在线记录id可以添加到项目库的数据
*
* @return
*/
@Override
public JProject getAddProject(Long id) {
return baseMapper.getAddProject(id);
}
}

202
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseFillServiceImpl.java
Unescape View File

@ -0,0 +1,202 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest;
import com.ruoyi.jjh.declaration.service.*;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
/**
* @author du
* @since 2024/7/24 13:53
*/
@Service
public class BmsEnterpriseFillServiceImpl implements IBmsEnterpriseFillService {
@Resource
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Autowired
private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService;
@Autowired
private IBmsEnterpriseDirectoryService bmsEnterpriseDirectoryService;
@Autowired
private IBmsTemplateRecordService iBmsTemplateRecordService;
@Autowired
private ICommonService iCommonService;
@Autowired
private JProjectService jProjectService;
/**
* 企业填报
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(EnterpriseFillResquest enterpriseFillResquest) {
BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getTyshxydm, enterpriseFillResquest.getCreditCode()));
if (BeanUtil.isEmpty(basicInfo)) {
throw new ServiceException("申请企业未入企业库！");
}
BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, enterpriseFillResquest.getCreditCode()).eq(BmsEnterpriseDirectory::getTemplateRecordId, enterpriseFillResquest.getTemplateRecordId()));
if (BeanUtil.isEmpty(enterpriseDirectory)) {
throw new ServiceException("申请企业不在企业名录中！");
}
// 申请是否过期或者该申请是不限时的
// 如果该申报任务是不需要审批的则修改状态为已填报
BmsTemplateRecord templateRecord = iBmsTemplateRecordService.getById(enterpriseFillResquest.getTemplateRecordId());
if (templateRecord.getStatus() == 0) {
throw new ServiceException("该申请还未到填报时间");
} else if (templateRecord.getStatus() == 1) {
throw new ServiceException("该申请已经过期");
}
BmsDeclarationRecords de = new BmsDeclarationRecords();
de.setId(enterpriseFillResquest.getDeclarationId());
de.setTemplateJson(enterpriseFillResquest.getTemplateJson());
//如果该申报任务是不需要审批的则修改状态为已填报
if (templateRecord.getIsApproval() == 0) {
de.setStatus(6L);
} else {
de.setStatus(1L);
//新增项目到项目库
//获取某个在线记录id可以添加到项目库的数据
JProject addProject = iBmsDeclarationRecordsService.getAddProject(enterpriseFillResquest.getDeclarationId());
addProject.setStatus(1);
Map<String, String> sm = parseJson(enterpriseFillResquest.getTemplateJson());
addProject.setOtherJson(sm.get("str"));
addProject.setFileJson(sm.get("fileStr"));
jProjectService.save(addProject);
de.setJjhProjectId(addProject.getId());
//生成审批
iCommonService.insertAuditRecord(enterpriseFillResquest.getDeclarationId(), 0);
}
return iBmsDeclarationRecordsService.updateById(de);
}
/**
* 解析模板json
*/
@Override
public Map<String, String> parseJson(String json) {
JSONArray js1 = JSONObject.parse(json).getJSONArray("fields");
JSONArray ps1 = new JSONArray();
JSONArray ps2 = new JSONArray();
Map<String, String> obj1 = new HashMap<>();
StringBuilder str = new StringBuilder("{");
StringBuilder fileStr = new StringBuilder("{");
for (Object o : js1) {
JSONObject parse = JSONObject.parse(o.toString());
if (!"el-upload".equals(parse.get("tag"))) {
ps1.add(parse.toString());
}else{
ps2.add(parse.toString());
}
}
for (Object o : ps1) {
JSONObject parse = JSONObject.parse(o.toString());
//解析下拉框和单选框
if ("el-select".equals(parse.get("tag")) || "el-radio-group".equals(parse.get("tag"))) {
JSONArray k = parse.getJSONArray("options");
for (int j = 0; j < k.size(); j++) {
if (JSONObject.parse(k.getString(j)).get("value").equals(parse.get("defaultValue"))) {
str.append('"').append(parse.get("label").toString()).append('"').append(":")
.append('"').append(JSONObject.parse(k.getString(j)).get("label")).append('"');
}
}
} else {
str.append('"').append(parse.get("label").toString()).append('"').append(":");
if (parse.get("defaultValue") == null) {
str.append('"').append(" ").append('"');
} else {
String result = parse.get("defaultValue").toString()
.replace("[", "")
.replace("]", "")
.replace(",", "至")
.replace("\"", "");
if ("true".equals(result)) {
result = "是";
}
str.append('"').append(result).append('"');
}
}
str.append(",");
}
str.append("}");
obj1.put("str", str.toString().replaceAll(",(?!.*,)", ""));
//解析文件
for (Object o : ps2) {
JSONObject s1 = JSONObject.parse(o.toString());
fileStr.append('"').append(s1.get("label").toString()).append('"').append(":")
.append('"').append(s1.get("defaultValue")).append('"').append(",");
}
fileStr.append("}");
obj1.put("fileStr", fileStr.toString().replaceAll(",(?!.*,)", ""));
return obj1;
}
/**
* 初审驳回之后企业重新填报的接口
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void update(EnterpriseFillResquest enterpriseFillResquest) {
//获取该条申报数据
BmsDeclarationRecords dc = iBmsDeclarationRecordsService.getById(enterpriseFillResquest.getDeclarationId());
if (dc.getStatus() != 10L) {
throw new ServiceException("该申报未被初审驳回!");
}
dc.setTemplateJson(enterpriseFillResquest.getTemplateJson());
dc.setStatus(1L);
iBmsDeclarationRecordsService.updateById(dc);
JProject addProject = new JProject();
addProject.setStatus(1);
addProject.setId(dc.getJjhProjectId());
Map<String, String> sm = parseJson(enterpriseFillResquest.getTemplateJson());
addProject.setOtherJson(sm.get("str"));
addProject.setFileJson(sm.get("fileStr"));
jProjectService.updateById(addProject);
// 修改审批状态
iCommonService.insertAuditRecord(enterpriseFillResquest.getDeclarationId(), 0);
}
/**
* 上传文件
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void uploadFile(EnterpriseFileResquest req) {
//获取该条申报数据
BmsDeclarationRecords ac = iBmsDeclarationRecordsService.getById(req.getDeclarationId());
BmsDeclarationRecords newAc = new BmsDeclarationRecords();
newAc.setId(req.getDeclarationId());
newAc.setTemplateJson(req.getTemplateJson());
iBmsDeclarationRecordsService.updateById(newAc);
JProject addProject = new JProject();
addProject.setId(ac.getJjhProjectId());
Map<String, String> sm = parseJson(req.getTemplateJson());
addProject.setFileJson(sm.get("fileStr"));
jProjectService.updateById(addProject);
}
}

60
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateInfoServiceImpl.java
Unescape View File

@ -1,17 +1,16 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo;
import com.ruoyi.jjh.declaration.mapper.BmsTemplateInfoMapper;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -33,7 +32,6 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
@Autowired
private IBmsEnterpriseDirectoryService enterpriseDirectoryService;
/**
* 查询申报模板信息列表
*
@ -41,7 +39,18 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
* @return 申报模板信息
*/
@Override
public List<BmsTemplateInfoQueryVo> selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo) {
public Page<BmsTemplateInfo> selectBmsTemplateInfoList(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo) {
return baseMapper.templateInfoList(page,bmsTemplateInfo);
}
/**
* 新增项目时查询所有模板信息
*
* @param bmsTemplateInfo 申报模板信息
* @return 申报模板信息集合
*/
@Override
public List<BmsTemplateInfo> selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo) {
return baseMapper.templateInfoList(bmsTemplateInfo);
}
@ -108,4 +117,47 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
public int deleteBmsTemplateInfoById(Long id) {
return baseMapper.deleteBmsTemplateInfoById(id);
}
/**
* 新增申报模板
*/
@Override
public Boolean add(BmsTemplateInfo bmsTemplateInfo) {
// String str ="bms_"+ RandomUtil.randomString(5)+LocalDate.now().getMonthValue()+LocalDate.now().getDayOfMonth();
// bmsTemplateInfo.setTableName(str);
changeStatus(bmsTemplateInfo);
//新增的时候根据当前时间判断状态是否有效
return save(bmsTemplateInfo);
}
/**
* 查询单个模板
*/
@Override
public BmsTemplateInfo selectByIdOne(Long id) {
return baseMapper.selectByIdOne(id);
}
/**
* 修改申报模板的状态
*/
@Override
public void changeStatus(BmsTemplateInfo items) {
LocalDate currentDate = LocalDate.now();
LocalDate startDate = LocalDate.of(items.getUseStart().getYear(), items.getUseStart().getMonth(), items.getUseStart().getDayOfMonth());
LocalDate endDate = LocalDate.of(items.getUseEnd().getYear(), items.getUseEnd().getMonth(), items.getUseEnd().getDayOfMonth());
if (currentDate.isBefore(startDate)) {
items.setStatus(0);
}
if (currentDate.isAfter(endDate)) {
items.setStatus(0);
}
if (currentDate.equals(startDate) || currentDate.equals(endDate)) {
items.setStatus(1);
}
if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) {
items.setStatus(1);
}
}
}

235
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java
Unescape View File

@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.jjh.declaration.component.TimingRemindImpl;
import com.ruoyi.jjh.declaration.component.TimingRemindService;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.*;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
@ -20,10 +17,7 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo;
import com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper;
import com.ruoyi.jjh.declaration.regular.TimeChange;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import com.ruoyi.jjh.declaration.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -51,12 +45,14 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Resource
private TimingRemindService timingRemindImpl;
@Resource
private IBmsDeclarationRecordsService bmsDeclarationRecordsService;
@Resource
private IBmsEnterpriseDirectoryService iBmsEnterpriseDirectoryService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
/**
* 是否是正式环境
*/
@ -69,23 +65,101 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
private TimeChange tiTimeChange;
/**
* 查询在线模板
* 分页查询在线模板列表
*
* @param id 在线模板主键
* @return 在线模板
* @param bmsTemplateRecordQueryDto 在线模板
* @return 在线模板集合
*/
@Override
public BmsTemplateRecordVo selectBmsTemplateRecordById(Long id) {
BmsTemplateRecordVo bmsTemplateRecordVo = baseMapper.selectBmsTemplateRecordVoById(id);
public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
return baseMapper.selectTemplateRecordVo(page, bmsTemplateRecordQueryDto);
}
// /**
// * 企业端选择表单模板列表
// * @param bmsTemplateQueryDto
// * @return
// */
// @Override
// public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto) {
// Long enterpriseId = bmsTemplateQueryDto.getEnterpriseId();
// BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.getById(enterpriseId);
// if (BeanUtil.isNotEmpty(bmsEnterpriseBasicInfo)) {
// bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getTyshxydm());
// return baseMapper.selectBmsTemplateNameList(bmsTemplateQueryDto);
// }else {
// return null;
// }
// }
/**
* 补录
*
* @param bmsTemplateRecordUpdateDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
BmsTemplateRecord infos = getById(bmsTemplateRecordUpdateDto.getId());
BmsTemplateInfo tp = iBmsTemplateInfoService.getById(bmsTemplateRecordUpdateDto.getTemplateId());
if (infos.getIsTime() == 1){
bmsTemplateRecordUpdateDto.setStartTime(null);
bmsTemplateRecordUpdateDto.setEndTime(null);
bmsTemplateRecordUpdateDto.setStatus(3);
}else if(infos.getIsTime() == 0){
//只有未修改之前是过期的才能补录
if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
throw new ServiceException("未过期不可以补录");
}
tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
throw new ServiceException("请修改时间范围为有效区间");
}
}else {
throw new ServiceException("补录失败");
}
int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
//要添加的在线申报记录
List<BmsDeclarationRecords> drlist = new ArrayList<>();
//获取前端传递的企业名录列表
List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordUpdateDto
.getEnterpriseDirectoryList();
//先去查找企业名录中对应该在线模板的相关企业
List<BmsEnterpriseDirectory> list = enterpriseDirectoryService.lambdaQuery()
.eq(BmsEnterpriseDirectory::getTemplateRecordId, id).list();
bmsTemplateRecordVo.setEnterpriseDirectoryList(list);
return bmsTemplateRecordVo;
.eq(BmsEnterpriseDirectory::getTemplateRecordId, bmsTemplateRecordUpdateDto.getId()).list();
//首先部分企业和所有企业去区分
if (bmsTemplateRecordUpdateDto.getIsFrame() == 0) {
enterpriseDirectoryList = new ArrayList<>();
//企业信息表里所有企业
List<BmsEnterpriseBasicInfo> allList = iBmsEnterpriseBasicInfoService.list();
//将信息表的所有企业添加到名录表
for (BmsEnterpriseBasicInfo x : allList) {
BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory();
bmsEnterpriseDirectory.setCreditCode(x.getTyshxydm());
bmsEnterpriseDirectory.setEnterpriseName(x.getQymc());
enterpriseDirectoryList.add(bmsEnterpriseDirectory);
}
}
//java有两个list实体类集合 如果a集合某条数据里面的name和b里面某条数据的name相等 就去除a的该条数据
enterpriseDirectoryList.removeIf(entityA -> list.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode())));
enterpriseDirectoryList.forEach(x->{
x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), tp.getTemplateJson());
});
//新增到企业名录
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
//最后新添加进在线申报记录
iBmsDeclarationRecordsService.saveBatch(drlist);
return num;
}
/**
* 查询在线模板列表
* 导出查询所有在线模板列表
*
* @param bmsTemplateRecordQueryDto 在线模板
* @return 在线模板
@ -95,26 +169,18 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
return baseMapper.selectTemplateRecordVo(bmsTemplateRecordQueryDto);
}
/**
* 获取在线模板详细信息
*/
@Override
public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
return baseMapper.selectTemplateRecordVo(page, bmsTemplateRecordQueryDto);
}
@Override
public List<BmsTemplateRecordQueryVo> selectTemplateRecordList(String creditCode) {
return baseMapper.selectTemplateRecordList(creditCode);
public BmsTemplateRecordVo selectBmsTemplateRecordById(Long id) {
BmsTemplateRecordVo bmsTemplateRecordVo = baseMapper.selectBmsTemplateRecordVoById(id);
List<BmsEnterpriseDirectory> list = enterpriseDirectoryService.lambdaQuery()
.eq(BmsEnterpriseDirectory::getTemplateRecordId, id).list();
bmsTemplateRecordVo.setEnterpriseDirectoryList(list);
return bmsTemplateRecordVo;
}
@Override
public List<BmsTemplateRecordQueryVo> selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto) {
Long enterpriseId = bmsTemplateQueryDto.getEnterpriseId();
BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.getById(enterpriseId);
if (BeanUtil.isNotEmpty(bmsEnterpriseBasicInfo)) {
bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getTyshxydm());
return baseMapper.selectBmsTemplateNameList(bmsTemplateQueryDto);
}
return null;
}
/**
* 新增在线模板
@ -125,9 +191,10 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
@Override
@Transactional(rollbackFor = Exception.class)
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto) {
// 1、新增申报任务时，增加一个选项：是否审批（需要审批/不需要审批），选了“不需要审批”的企业填报后，状态变为“已填报”，不再进行后续流程，并且这种情况不对接到项目库。
// 1 新增申报任务时，增加一个选项：是否审批（需要审批/不需要审批），选了“不需要审批”的企业填报后，状态变为“已填报”，不再进行后续流程，并且这种情况不对接到项目库。
// 2、新增申报任务时，若项目分类选择了“企业信息收集”里面的，则只能选择“不需要审批”，这类申报都不对接项目库。
if(bmsTemplateRecordAddDto.getTemplateId()==12&bmsTemplateRecordAddDto.getIsApproval()==1){
BmsTemplateInfo tp = iBmsTemplateInfoService.getById(bmsTemplateRecordAddDto.getTemplateId());
if(tp.getProjectBigType()== 11 &bmsTemplateRecordAddDto.getIsApproval()==1){
throw new ServiceException("企业信息收集模板,不需要审批");
}
int num = 0;
@ -156,7 +223,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
//如果前端部分企业名录集合为空
if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
enterpriseDirectoryList.forEach(x -> {
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), bmsTemplateRecordAddDto.getTemplateId());
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(),tp.getTemplateJson());
x.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
});
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
@ -169,7 +236,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
bms.setEnterpriseName(items.getQymc());
bms.setCreditCode(items.getTyshxydm());
copyList.add(bms);
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getTyshxydm(), bmsTemplateRecordAddDto.getTemplateId());
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getTyshxydm(),tp.getTemplateJson());
}
enterpriseDirectoryService.saveBatch(copyList);
}
@ -185,16 +252,19 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
return num;
}
private void getDeclarationRecordsList(BmsTemplateRecord bmsTemplateRecordAddDto, List<BmsDeclarationRecords> drlist, String creditCode, Long items) {
/**
* 生成在线申报记录
*/
private void getDeclarationRecordsList(BmsTemplateRecord bmsTemplateRecordAddDto, List<BmsDeclarationRecords> drlist, String creditCode,String json) {
BmsDeclarationRecords drItems = new BmsDeclarationRecords();
drItems.setProjectName(bmsTemplateRecordAddDto.getEnterpriseDirectory());
drItems.setYear(String.valueOf(Year.now().getValue()));
drItems.setCreditCode(creditCode);
drItems.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
drItems.setStatus(0L);
drItems.setTemplateId(Math.toIntExact(items));
drItems.setTemplateId(bmsTemplateRecordAddDto.getTemplateId());
drItems.setIsDeleted(0L);
drItems.setTemplateJson(json);
drlist.add(drItems);
}
@ -274,84 +344,5 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
return baseMapper.deleteBmsTemplateRecordById(id);
}
/**
* 补录
*
* @param bmsTemplateRecordUpdateDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
BmsTemplateRecord infos = getById(bmsTemplateRecordUpdateDto.getId());
if (infos.getIsTime() == 1){
bmsTemplateRecordUpdateDto.setStartTime(null);
bmsTemplateRecordUpdateDto.setEndTime(null);
bmsTemplateRecordUpdateDto.setStatus(3);
}else if(infos.getIsTime() == 0){
//只有未修改之前是过期的才能补录
if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
throw new ServiceException("未过期不可以补录");
}
tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
throw new ServiceException("请修改时间范围为有效区间");
}
}else {
throw new ServiceException("补录失败");
}
int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
//要添加的在线申报记录
List<BmsDeclarationRecords> drlist = new ArrayList<>();
//获取前端传递的企业名录列表
List<BmsEnterpriseDirectory> enterpriseDirectoryList = bmsTemplateRecordUpdateDto
.getEnterpriseDirectoryList();
//先去查找企业名录中对应该在线模板的相关企业
List<BmsEnterpriseDirectory> list = enterpriseDirectoryService.lambdaQuery()
.eq(BmsEnterpriseDirectory::getTemplateRecordId, bmsTemplateRecordUpdateDto.getId()).list();
//首先部分企业和所有企业去区分
if (bmsTemplateRecordUpdateDto.getIsFrame() == 0) {
enterpriseDirectoryList = new ArrayList<>();
//企业信息表里所有企业
List<BmsEnterpriseBasicInfo> allList = iBmsEnterpriseBasicInfoService.list();
//将信息表的所有企业添加到名录表
for (BmsEnterpriseBasicInfo x : allList) {
BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory();
bmsEnterpriseDirectory.setCreditCode(x.getTyshxydm());
bmsEnterpriseDirectory.setEnterpriseName(x.getQymc());
enterpriseDirectoryList.add(bmsEnterpriseDirectory);
}
}
//java有两个list实体类集合 如果a集合某条数据里面的name和b里面某条数据的name相等 就去除a的该条数据
enterpriseDirectoryList.removeIf(entityA -> list.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode())));
enterpriseDirectoryList.forEach(x->{
x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
});
//新增到企业名录
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
//最后新添加进在线申报记录
iBmsDeclarationRecordsService.saveBatch(drlist);
return num;
}
/**
* 暂省略（和企业信息表做对比）
*
* @param enterpriseDirectoryList
* @return
*/
private List<BmsEnterpriseBasicInfo> filterEnterprise(List<BmsEnterpriseDirectory> enterpriseDirectoryList) {
//保存所有的信用代码
List<String> codeList = new ArrayList<>();
for (BmsEnterpriseDirectory x : enterpriseDirectoryList) {
codeList.add(x.getCreditCode());
}
//根据信用代码去企业信息表里查找该企业，如果能找到并且该企业未填报过该模板 就添加企业id
LambdaQueryWrapper<BmsEnterpriseBasicInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getTyshxydm, codeList);
return iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper);
}
}

206
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java
Unescape View File

@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.context.SecurityContextHolder;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
@ -174,212 +175,27 @@ public class CommonServiceImpl implements ICommonService {
}
}
/**
* 获取申请记录详情
*
* @param declarationTemplateType 模板id
* @param detailId 详情id
* @param declarationRecordsVo
* @return
* @author emiya.xie
* @create 2023/9/5 15:55
*/
@Override
public void getData(int declarationTemplateType, Long detailId, DeclarationRecordsVo declarationRecordsVo) {
// 根据模板id查询对应数据
if (declarationTemplateType == 1) {
// 项目落户奖补
BmsProjectSettlementAwardQueryVo settlementAwardQueryVo = iBmsProjectSettlementAwardService.selectBmsProjectSettlementAwardById(detailId);
if(detailId!=null){
List<BmsFundingDetail> list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, settlementAwardQueryVo.getId()).list();
settlementAwardQueryVo.setFundingDetailList(list);
}
declarationRecordsVo.setBmsProjectSettlementAwardQueryVo(settlementAwardQueryVo);
} else if (declarationTemplateType == 2) {
// 做大做强奖补
BmsBigStrongAwardQueryVo bmsBigStrongAwardQueryVo = iBmsBigStrongAwardService.selectBmsBigStrongAwardById(detailId);
if(detailId!=null){
List<BmsFundingDetail> list = iBmsFundingDetailService.lambdaQuery().eq(BmsFundingDetail::getDetailId, bmsBigStrongAwardQueryVo.getId()).list();
bmsBigStrongAwardQueryVo.setFundingDetailList(list);
}
declarationRecordsVo.setBmsBigStrongAwardQueryVo(bmsBigStrongAwardQueryVo);
} else if (declarationTemplateType == 3) {
// 载体建设奖补
declarationRecordsVo.setBmsCarrierConstructionAward(iBmsCarrierConstructionAwardService.selectBmsCarrierConstructionAwardById(detailId));
} else if (declarationTemplateType == 4) {
// 平台建设奖补
declarationRecordsVo.setBmsPlatformConstructionAward(iBmsPlatformConstructionAwardService.selectBmsPlatformConstructionAwardById(detailId));
} else if (declarationTemplateType == 5) {
// 品牌打造奖补
declarationRecordsVo.setBmsBrandingAward(iBmsBrandingAwardService.selectBmsBrandingAwardById(detailId));
} else if (declarationTemplateType == 6) {
// 场景开放奖补
declarationRecordsVo.setBmsSceneOpeningAward(iBmsSceneOpeningAwardService.selectBmsSceneOpeningAwardById(detailId));
} else if (declarationTemplateType == 7) {
// 信用管理奖补
declarationRecordsVo.setBmsCreditManagement(iBmsCreditManagementService.selectBmsCreditManagementById(detailId));
} else if (declarationTemplateType == 8) {
// 5G+工业互联网奖补
declarationRecordsVo.setBmsIndustrialInternetAward(iBmsIndustrialInternetAwardService.selectBmsIndustrialInternetAwardById(detailId));
} else if (declarationTemplateType == 9) {
// 制造服务业有效投入奖补
declarationRecordsVo.setBmsManufacturingServicesAward(iBmsManufacturingServicesAwardService.selectBmsManufacturingServicesAwardById(detailId));
} else if (declarationTemplateType == 10) {
// 物流发展奖补
declarationRecordsVo.setBmsLogisticsDevelopmentAward(iBmsLogisticsDevelopmentAwardService.selectBmsLogisticsDevelopmentAwardById(detailId));
} else if (declarationTemplateType == 11) {
// 两业融合奖补
declarationRecordsVo.setBmsIntegrationIndustries(iBmsIntegrationIndustriesService.selectBmsIntegrationIndustriesById(detailId));
}else if (declarationTemplateType == 12) {
// 两业融合奖补
declarationRecordsVo.setBmsOutQuitProducts(iBmsOutQuitProductsService.getById(detailId));
}
}
/**
* 生成审批信息
*
* @param declarationRecordId
* @param approvalType
* @return
* @author emiya.xie
* @create 2023/9/9 16:44
*/
@Override
public void insertProcessInfo(Long declarationRecordId, Integer approvalType) {
// 获取流程信息
List<BmsProcessInfo> processInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, approvalType).list();
if (CollectionUtil.isNotEmpty(processInfoList)) {
List<BmsApprovalInfo> approvalList = new ArrayList<>();
processInfoList.forEach(x -> {
BmsApprovalInfo approvalInfo = new BmsApprovalInfo();
approvalInfo.setProcessId(x.getId());
approvalInfo.setDeclarationRecordsId(declarationRecordId);
approvalInfo.setApprovalStatus(0);
approvalInfo.setApprovalById(x.getApprovalById());
approvalInfo.setSort(x.getSort());
if (x.getSort() == 1) {
approvalInfo.setIsReview(0);
}
approvalList.add(approvalInfo);
});
iBmsApprovalInfoService.saveOrUpdateBatch(approvalList);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void insertAuditRecord(Long declarationRecordId, Integer approvalType) {
// 获取流程信息
List<BmsProcessInfo> processInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, approvalType).list();
List<BmsApprovalInfo> list = new ArrayList<BmsApprovalInfo>();
list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list();
if (CollectionUtil.isNotEmpty(processInfoList)) {
List<BmsApprovalInfo> finalList = list;
processInfoList.forEach(x -> {
if (x.getSort() == 1) {
addApprovalInfo(declarationRecordId, x.getApprovalById(), x.getId(), finalList.size() + 1);
}
// if (x.getApprovalById().equals(SecurityContextHolder.getUserId())){
// addApprovalInfo(declarationRecordId,x.getApprovalById(),x.getId(),list.size());
// }
});
}
List<BmsApprovalInfo> list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list();
// 新增记录
BmsApprovalInfo bmsApprovalInfo = new BmsApprovalInfo();
bmsApprovalInfo.setProcessId(1L);
bmsApprovalInfo.setDeclarationRecordsId(declarationRecordId);
bmsApprovalInfo.setApprovalStatus(0);
bmsApprovalInfo.setSort(list.size() + 1);
bmsApprovalInfo.setApprovalDept(105L);
bmsApprovalInfo.setIsReview(0);
iBmsApprovalInfoService.save(bmsApprovalInfo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateAuditRecord(Long declarationRecordId, Integer approvalType) {
List<BmsApprovalInfo> list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list();
if (CollectionUtil.isNotEmpty(list)) {
list.forEach(x -> {
BmsApprovalInfo bmsApprovalInfo = new BmsApprovalInfo();
bmsApprovalInfo.setId(x.getId());
bmsApprovalInfo.setApprovalStatus(0);
iBmsApprovalInfoService.updateById(bmsApprovalInfo);
});
}
}
/**
* 新增审批记录
*
* @param declarationRecordId
* @param approvalById
* @param processId
* @param sort
* @return
* @author emiya.xie
* @create 2023/9/14 14:50
*/
public void addApprovalInfo(Long declarationRecordId, Long approvalById, Long processId, Integer sort) {
BmsApprovalInfo approvalInfo = new BmsApprovalInfo();
approvalInfo.setProcessId(processId);
approvalInfo.setDeclarationRecordsId(declarationRecordId);
approvalInfo.setApprovalStatus(0);
approvalInfo.setApprovalById(approvalById);
approvalInfo.setApprovalDept(105L);
approvalInfo.setSort(sort);
approvalInfo.setIsReview(0);
iBmsApprovalInfoService.save(approvalInfo);
}
/**
* 清空审批流程
*
* @param declarationRecordId
* @return
* @author emiya.xie
* @create 2023/9/11 10:30
*/
@Override
public void cleanProcessList(Long declarationRecordId) {
// 获取流程信息
List<BmsApprovalInfo> list = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, declarationRecordId).list();
if (CollectionUtil.isNotEmpty(list)) {
list.forEach(x -> {
x.setApprovalStatus(0);
x.setApprovalOpinions(null);
x.setApprovalAttachment(null);
x.setApprovalTime(null);
if (x.getSort() == 1) {
x.setIsReview(0);
} else {
x.setIsReview(1);
}
});
iBmsApprovalInfoService.saveOrUpdateBatch(list);
}
}
@Override
public List<Long> getUserIds(Long userId) {
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public int updateBmsApprovalInfo(BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) {
Boolean flag = false;
List<BmsApprovalInfo> approvalInfoList = iBmsApprovalInfoService.lambdaQuery().eq(BmsApprovalInfo::getDeclarationRecordsId, bmsApprovalInfoUpdateDto.getDeclarationRecordsId()).orderByAsc(BmsApprovalInfo::getSort).list();
if (CollectionUtil.isNotEmpty(approvalInfoList)) {
approvalInfoList.forEach(x -> {
if (x.getId().equals(bmsApprovalInfoUpdateDto.getId())) {
BeanUtil.copyProperties(bmsApprovalInfoUpdateDto, x);
x.setApprovalById(SecurityContextHolder.getUserId());
}
if ((bmsApprovalInfoUpdateDto.getSort() + 1) == x.getIsReview()) {
x.setIsReview(0);
}
});
flag = iBmsApprovalInfoService.saveOrUpdateBatch(approvalInfoList);
}
if (!flag) {
return 0;
}
return 1;
}
@Override
public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto) {

54
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java
Unescape View File

@ -53,33 +53,33 @@ public class OpenInterfaceServiceImpl implements IOpenInterfaceService {
private IBmsProjectSettlementAwardService iBmsProjectSettlementAwardService;
@Override
public EnterpriseInfoTemplateVo enterpriseList(String creditCode) {
EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = new EnterpriseInfoTemplateVo();
// 获取企业信息
List<BmsEnterpriseBasicInfo> enterpriseList = iBmsEnterpriseBasicInfoService.lambdaQuery()
.like(BmsEnterpriseBasicInfo::getTyshxydm, creditCode).list();
List<BmsEnterpriseDirectory> directoryList = new ArrayList<>();
List<BmsTemplateRecord> templateRecordList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(enterpriseList)) {
// 企业信息不为空，获取企业名录信息
enterpriseInfoTemplateVo.setEnterpriseBasicList(enterpriseList);
List<String> creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getTyshxydm).collect(Collectors.toList());
// 企业名录列表
directoryList = iBmsEnterpriseDirectoryService.lambdaQuery().in(BmsEnterpriseDirectory::getCreditCode, creditCodeList).list();
System.out.println(directoryList);
}
if (CollectionUtil.isNotEmpty(directoryList)) {
List<Long> templateRecordIdList = directoryList.stream().map(BmsEnterpriseDirectory::getTemplateRecordId).distinct()
.collect(Collectors.toList());
templateRecordList = iBmsTemplateRecordService.lambdaQuery().in(BmsTemplateRecord::getId, templateRecordIdList)
.eq(BmsTemplateRecord::getRoad, 1L).list();
}
List<BmsTemplateRecordQueryVo> bmsTemplateRecordQueryVos = iBmsTemplateRecordService
.selectTemplateRecordList(creditCode);
enterpriseInfoTemplateVo.setTemplateRecordList(bmsTemplateRecordQueryVos);
return enterpriseInfoTemplateVo;
}
// @Override
// public EnterpriseInfoTemplateVo enterpriseList(String creditCode) {
// EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = new EnterpriseInfoTemplateVo();
// // 获取企业信息
// List<BmsEnterpriseBasicInfo> enterpriseList = iBmsEnterpriseBasicInfoService.lambdaQuery()
// .like(BmsEnterpriseBasicInfo::getTyshxydm, creditCode).list();
// List<BmsEnterpriseDirectory> directoryList = new ArrayList<>();
// List<BmsTemplateRecord> templateRecordList = new ArrayList<>();
// if (CollectionUtil.isNotEmpty(enterpriseList)) {
// // 企业信息不为空，获取企业名录信息
// enterpriseInfoTemplateVo.setEnterpriseBasicList(enterpriseList);
// List<String> creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getTyshxydm).collect(Collectors.toList());
// // 企业名录列表
// directoryList = iBmsEnterpriseDirectoryService.lambdaQuery().in(BmsEnterpriseDirectory::getCreditCode, creditCodeList).list();
// System.out.println(directoryList);
// }
// if (CollectionUtil.isNotEmpty(directoryList)) {
// List<Long> templateRecordIdList = directoryList.stream().map(BmsEnterpriseDirectory::getTemplateRecordId).distinct()
// .collect(Collectors.toList());
// templateRecordList = iBmsTemplateRecordService.lambdaQuery().in(BmsTemplateRecord::getId, templateRecordIdList)
// .eq(BmsTemplateRecord::getRoad, 1L).list();
// }
// List<BmsTemplateRecordQueryVo> bmsTemplateRecordQueryVos = iBmsTemplateRecordService
// .selectTemplateRecordList(creditCode);
// enterpriseInfoTemplateVo.setTemplateRecordList(bmsTemplateRecordQueryVos);
// return enterpriseInfoTemplateVo;
// }
/**
* 新增申报记录

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java
Unescape View File

@ -53,7 +53,7 @@ public class JContactsController extends BaseController {
if (!admin && b) {
jContacts.setTyshxydm(str);
}
return success(jContactsService.page( jContacts));
return success(jContactsService.page(jContacts));
}

43
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java
Unescape View File

@ -6,12 +6,10 @@ import com.ruoyi.jjh.ent.entity.response.HonorResponse;
import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse;
import com.ruoyi.jjh.ent.service.JDataScreenService;
import com.ruoyi.jjh.ent.service.SmsAlertsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@ -54,4 +52,43 @@ public class JDataScreenController extends BaseController {
return success(jDataScreenService.getProjectTracking());
}
/**
* 服务业发展总览
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "服务业发展总览")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "年份1 季度2", required = true),
})
@GetMapping("/servicesDevelop")
public AjaxResult servicesDevelop(Integer type) {
//数据更新要从新维护SQL
return success(jDataScreenService.servicesDevelop(type));
}
/**
* 行业纵深情况
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "行业纵深情况")
@GetMapping("/getIndustryDepth")
public AjaxResult getIndustryDepth() {
return success(jDataScreenService.getIndustryDepth());
}
/**
* 所有分行业汇总
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "所有分行业汇总")
@GetMapping("/getAllIndustry")
public AjaxResult getAllIndustry() {
return success(jDataScreenService.getAllIndustry());
}
}

57
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JHeadQuartersRevenueController.java
Unescape View File

@ -0,0 +1,57 @@
package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import static com.ruoyi.common.core.domain.AjaxResult.success;
/**
* 总部企业（j_headquarters_revenue）表控制层
* @author du
* @since 2024/7/29 13:09
*/
@RestController
@RequestMapping("/jjh/headquartersRevenue")
@Api(tags = "总部企业")
public class JHeadQuartersRevenueController {
@Resource
private JHeadQuartersRevenueService jHeadQuartersRevenueService;
/**
* 分页查询总部企业
* @param page 分页参数
* @param js 请求参数
* @return 数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "分页查询总部企业", response = JHeadQuartersRevenue.class)
@GetMapping
public AjaxResult page(Page<JHeadQuartersRevenue> page, JHeadQuartersRevenueRequest js) {
return success(jHeadQuartersRevenueService.page(page,js));
}
/**
* 查询总部企业数量
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "查询总部企业数量", response = JHqCountResponse.class)
@GetMapping("/selectZbCount")
public AjaxResult selectZbCount() {
return success(jHeadQuartersRevenueService.selectZbCount());
}
}

67
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JServicesListController.java
Unescape View File

@ -0,0 +1,67 @@
package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JServicesListService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.boot.SpringBootVersion;
import org.springframework.core.SpringVersion;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
* 服务业企业名单（j_services_list）表控制层
*
* @author du
* @since 2024/7/26 15:29
*/
@RestController
@RequestMapping("/jjh/servicesList")
@Api(tags = "服务业企业名单")
public class JServicesListController extends BaseController {
@Resource
private JServicesListService jServicesListService;
/**
* 分页查询服务业企业名单
* @param page 分页参数
* @param js 请求体
* @return 分页数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "分页查询服务业企业名单", response = JServicesList.class)
@GetMapping
public AjaxResult selectAll(Page<JServicesList> page, JServicesListRequest js) {
return success(jServicesListService.page(page,js));
}
/**
* 首页服务业数据统计
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "首页服务业数据统计", response = JServicesListCountResponse.class)
@GetMapping("/selectCount")
public AjaxResult selectAllServicesCount() {
return success(jServicesListService.selectAllServicesCount());
}
}

77
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JHeadQuartersRevenue.java
Unescape View File

@ -0,0 +1,77 @@
package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 总部企业返回体
* @author du
* @since 2024/7/29 13:01
*/
@Data
@ApiModel("总部企业返回体")
@TableName(value = "j_headquarters_revenue")
public class JHeadQuartersRevenue {
/**
* 企业名称
*/
@ApiModelProperty("企业名称")
private String qymc;
/**
* 【总部类型】
* 制造业总部：06-46
* 建筑业总部：47-50
* 批零住餐总部：51、52、61、62
* 贸易类总部：待定
* 服务业总部：其他所有的
*/
@ApiModelProperty("总部类别")
private String type;
/**
* 统一社会信用代码
*/
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 行业代码（五经普）
*/
@ApiModelProperty("行业代码（五经普）")
private String hydm;
/**
* 营收
*/
@ApiModelProperty("营收")
private Double revenue;
/**
* 税收
*/
@ApiModelProperty("税收")
private Double taxation;
/**
* 年份
*/
@ApiModelProperty("年份")
private String years;
/**
* 产值
*/
@ApiModelProperty("产值")
private Double output;
/**
* 销售额
*/
@ApiModelProperty("销售额")
private Double sales;
}

72
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JServicesList.java
Unescape View File

@ -0,0 +1,72 @@
package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 服务业企业名单（j_services_list）表实体类
* @author du
* @since 2024/7/26 15:29
*/
@Data
@ApiModel("服务业企业名单")
@TableName(value = "j_services_list")
public class JServicesList extends BaseInfoEntity {
/**
* Id
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 企业名称
*/
@ApiModelProperty("企业名称")
private String qymc;
/**
* 统一社会信用代码
*/
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 登记注册统计类别
*/
@ApiModelProperty("登记注册统计类别")
private String djzctjlb;
/**
* 行业代码
*/
@ApiModelProperty("行业代码")
private String hydm;
/**
* 1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐
*/
@ApiModelProperty("1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐")
private String servicesType;
/**
* 全年营收
*/
@TableField(exist = false)
@ApiModelProperty("全年营收")
private Double revenue;
/**
* 年份
*/
@TableField(exist = false)
@ApiModelProperty("年份")
private String years;
}

4
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JAddJobSmart.java
Unescape View File

@ -16,12 +16,12 @@ public class JAddJobSmart {
/**
* 定时提醒id
*/
@ApiModelProperty("统一社会信用代码")
@ApiModelProperty("定时提醒id")
private Long smartId;
/**
* 定时任务id
*/
@ApiModelProperty("统一社会信用代码")
@ApiModelProperty("定时任务id")
private Long jobId;
}

51
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JHeadQuartersRevenueRequest.java
Unescape View File

@ -0,0 +1,51 @@
package com.ruoyi.jjh.ent.entity.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 总部企业请求体
* @author du
* @since 2024/7/29 13:14
*/
@Data
@ApiModel("总部企业请求体")
public class JHeadQuartersRevenueRequest {
/**
* 企业名称
*/
@ApiModelProperty("企业名称")
private String qymc;
/**
* 统一社会信用代码
*/
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 年份
*/
@ApiModelProperty("年份")
private String years;
/**
* 【总部类型】
* 制造业总部：06-46
* 建筑业总部：47-50
* 批零住餐总部：51、52、61、62
* 贸易类总部：待定
* 服务业总部：其他所有的
*/
@ApiModelProperty("总部类型 1制造业总部 2建筑业总部 3批零住餐总部 4贸易类总部 5服务业总部")
private Integer type;
/**
* 小类区分
*/
@ApiModelProperty("小类区分 1省级总部 2市级总部 3区级总部")
private Integer projectSmallType;
}

33
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JServicesListRequest.java
Unescape View File

@ -0,0 +1,33 @@
package com.ruoyi.jjh.ent.entity.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 服务业企业名单请求体
* @author du
* @since 2024/7/26 15:45
*/
@Data
@ApiModel("服务业企业名单请求体")
public class JServicesListRequest {
/**
* 企业名称
*/
@ApiModelProperty("企业名称")
private String qymc;
/**
* 统一社会信用代码
*/
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐
*/
@ApiModelProperty("1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐")
private String servicesType;
}

71
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JAllIndustryResponse.java
Unescape View File

@ -0,0 +1,71 @@
package com.ruoyi.jjh.ent.entity.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Objects;
/**
* 所有分行业汇总返回类
*
* @author du
* @since 2024/7/25 15:54
*/
@ApiModel("所有分行业汇总返回类")
@Data
public class JAllIndustryResponse {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
JAllIndustryResponse that = (JAllIndustryResponse) o;
return Objects.equals(nameType, that.nameType) && Objects.equals(children, that.children) && Objects.equals(yearRevenue, that.yearRevenue) && Objects.equals(addValue, that.addValue) && Objects.equals(growth, that.growth) && Objects.equals(gdpProportion, that.gdpProportion);
}
@Override
public int hashCode() {
return Objects.hash(nameType, children, yearRevenue, addValue, growth, gdpProportion);
}
/**
* 行业类别名称
*/
@ApiModelProperty("行业类别名称")
private String nameType;
/**
* 子类
*/
@ApiModelProperty("子类")
private List<JAllIndustryResponse> children;
/**
* 全年营收（亿元）
*/
@ApiModelProperty("全年营收（亿元）")
private Double yearRevenue;
/**
* 增加值（亿元）
*/
@ApiModelProperty("增加值（亿元）")
private Double addValue;
/**
* 增加值增速（按不变价）
*/
@ApiModelProperty("增加值增速（按不变价）%")
private Double growth;
/**
* 增加值占GDP比重
*/
@ApiModelProperty("增加值占GDP比重 %")
private Double gdpProportion;
}

55
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JBigMiddleIndustryResponse.java
Unescape View File

@ -0,0 +1,55 @@
package com.ruoyi.jjh.ent.entity.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 行业大类中类返回实体类
* @author du
* @since 2024/7/25 18:09
*/
@ApiModel("行业大类中类返回实体类")
@Data
public class JBigMiddleIndustryResponse {
/**
* 行业大类
*/
@ApiModelProperty("行业大类")
private String categories;
/**
* 行业中类
*/
@ApiModelProperty("行业中类")
private String nameType;
/**
* 全年营收（亿元）
*/
@ApiModelProperty("全年营收（亿元）")
private Double yearRevenue;
/**
* 增加值（亿元）
*/
@ApiModelProperty("增加值（亿元）")
private Double addValue;
/**
* 增加值增速（按不变价）
*/
@ApiModelProperty("增加值增速（按不变价）%")
private Double growth;
/**
* 增加值占GDP比重
*/
@ApiModelProperty("增加值占GDP比重 %")
private Double gdpProportion;
}

32
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JHqCountResponse.java
Unescape View File

@ -0,0 +1,32 @@
package com.ruoyi.jjh.ent.entity.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 总部企业分小类数量
* @author du
* @since 2024/7/29 15:02
*/
@Data
@ApiModel("总部企业分小类数量")
public class JHqCountResponse {
/**
* 省级
*/
@ApiModelProperty("省级")
private Integer count1;
/**
* 市级
*/
@ApiModelProperty("市级")
private Integer count2;
/**
* 区级
*/
@ApiModelProperty("区级")
private Integer count3;
}

54
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JIndustryDepthResponse.java
Unescape View File

@ -0,0 +1,54 @@
package com.ruoyi.jjh.ent.entity.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 行业纵深情况返回类
* @author du
* @since 2024/7/25 14:16
*/
@Data
@ApiModel("行业纵深情况返回类")
public class JIndustryDepthResponse {
/**
* 年份
*/
@ApiModelProperty("年份")
private String years;
/**
* 行业大类
*/
@ApiModelProperty("行业大类")
private String industryCategories;
/**
* 全年营收（亿元）
*/
@ApiModelProperty("全年营收（亿元）")
private Double yearRevenue;
/**
* 增加值（亿元）
*/
@ApiModelProperty("增加值（亿元）")
private Double addValue;
/**
* 增加值增速（按不变价）
*/
@ApiModelProperty("增加值增速（按不变价）%")
private Double growth;
/**
* 增加值占GDP比重
*/
@ApiModelProperty("增加值占GDP比重 %")
private Double gdpProportion;
}

45
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JServicesDevelopResponse.java
Unescape View File

@ -0,0 +1,45 @@
package com.ruoyi.jjh.ent.entity.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 服务业发展总览返回类
* @author du
* @since 2024/7/25 10:33
*/
@Data
@ApiModel("服务业发展总览返回类")
public class JServicesDevelopResponse {
/**
* 年份
*/
@ApiModelProperty("年份")
private String developYear;
/**
* 季度
*/
@ApiModelProperty("季度")
private Integer quarterly;
/**
* 服务业增加值(亿元)
*/
@ApiModelProperty("服务业增加值(亿元)")
private Double valueAdded;
/**
* 服务业增速(%,可比价)
*/
@ApiModelProperty("服务业增速(%,可比价)")
private Double increaseSpeed;
/**
* 服务业增加值占GDP比重(%)
*/
@ApiModelProperty("服务业增加值占GDP比重(%)")
private Double gdpProportion;
}

39
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JServicesListCountResponse.java
Unescape View File

@ -0,0 +1,39 @@
package com.ruoyi.jjh.ent.entity.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 首页服务业数据统计返回体
* @author du
* @since 2024/7/29 9:17
*/
@Data
@ApiModel("首页服务业数据统计返回体")
public class JServicesListCountResponse {
/**
* 1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐
*/
@ApiModelProperty("1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐")
private Integer servicesType;
/**
* 企业数量
*/
@ApiModelProperty("企业数量")
private Integer qyCount;
/**
* 规上企业营收
*/
@ApiModelProperty("规上企业营收(亿元) / 税收贡献")
private Double allRevenue;
/**
* 全口径增加值
*/
@ApiModelProperty("全口径增加值(亿元) / 经营数据")
private Double addValue;
}

2
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/ProjectTrackingResponse.java
Unescape View File

@ -19,7 +19,7 @@ public class ProjectTrackingResponse {
/**
*
* 项目大类名字
*/
@ApiModelProperty("项目大类名字")
private String enterpriseDirectory;

29
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JDataScreenMapper.java
Unescape View File

@ -1,7 +1,6 @@
package com.ruoyi.jjh.ent.mapper;
import com.ruoyi.jjh.ent.entity.response.HonorResponse;
import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse;
import com.ruoyi.jjh.ent.entity.response.*;
import java.util.List;
@ -26,4 +25,30 @@ public interface JDataScreenMapper {
* @return 所有数据
*/
List<ProjectTrackingResponse> getProjectTracking();
/**
* 服务业发展总览
* @return 所有数据
*/
List<JServicesDevelopResponse> servicesDevelop( Integer type);
/**
* 行业纵深情况
* @return 所有数据
*/
List<JIndustryDepthResponse> getIndustryDepth();
/**
* 获取中类数据
* @return 所有数据
*/
List<JBigMiddleIndustryResponse> getMiddleIndustry();
/**
* 获取大类数据
* @return 所有数据
*/
List<JAllIndustryResponse> getBigIndustry();
}

35
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JHeadQuartersRevenueMapper.java
Unescape View File

@ -0,0 +1,35 @@
package com.ruoyi.jjh.ent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 总部企业（j_headquarters_revenue）表数据库访问层
* @author du
* @since 2024/7/26 15:36
*/
public interface JHeadQuartersRevenueMapper extends BaseMapper<JHeadQuartersRevenue> {
/**
* 分页查询总部企业
* @param page 分页参数
* @param js 请求参数
* @return 数据
*/
Page<JHeadQuartersRevenue> page(Page<JHeadQuartersRevenue> page, @Param("req") JHeadQuartersRevenueRequest js);
/**
* 查询总部企业数量
*/
JHqCountResponse selectZbCount();
}

38
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JServicesListMapper.java
Unescape View File

@ -0,0 +1,38 @@
package com.ruoyi.jjh.ent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 服务业企业名单（j_services_list）表数据库访问层
* @author du
* @since 2024/7/26 15:36
*/
public interface JServicesListMapper extends BaseMapper<JServicesList> {
/**
* 分页查询服务业企业名单
* @param page 分页参数
* @param js 请求体
* @return 分页数据
*/
Page<JServicesList> page(Page<JServicesList> page,@Param("req") JServicesListRequest js);
/**
* 首页服务业数据统计
*/
List<JServicesListCountResponse> selectAllServicesCount();
/**
* 首页服务业数据统计
*/
JServicesListCountResponse selectAllZbCount();
}

23
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JDataScreenService.java
Unescape View File

@ -1,7 +1,6 @@
package com.ruoyi.jjh.ent.service;
import com.ruoyi.jjh.ent.entity.response.HonorResponse;
import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse;
import com.ruoyi.jjh.ent.entity.response.*;
import java.util.List;
@ -23,4 +22,24 @@ public interface JDataScreenService {
* @return 所有数据
*/
List<ProjectTrackingResponse> getProjectTracking();
/**
* 服务业发展总览
* @return 所有数据
*/
List<JServicesDevelopResponse> servicesDevelop(Integer type);
/**
* 行业纵深情况
* @return 所有数据
*/
List<JIndustryDepthResponse> getIndustryDepth();
/**
* 所有分行业汇总
* @return 所有数据
*/
List<JAllIndustryResponse> getAllIndustry();
}

30
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JHeadQuartersRevenueService.java
Unescape View File

@ -0,0 +1,30 @@
package com.ruoyi.jjh.ent.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
/**
* 总部企业（j_headquarters_revenue）表业务层
* @author du
* @since 2024/7/29 13:11
*/
public interface JHeadQuartersRevenueService extends IService<JHeadQuartersRevenue> {
/**
* 分页查询总部企业
* @param page 分页参数
* @param js 请求参数
* @return 数据
*/
Page<JHeadQuartersRevenue> page(Page<JHeadQuartersRevenue> page, JHeadQuartersRevenueRequest js);
/**
* 查询总部企业数量
*/
JHqCountResponse selectZbCount();
}

32
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JServicesListService.java
Unescape View File

@ -0,0 +1,32 @@
package com.ruoyi.jjh.ent.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import java.util.List;
/**
* 服务业企业名单（j_services_list）表业务层
* @author du
* @since 2024/7/26 15:35
*/
public interface JServicesListService extends IService<JServicesList> {
/**
* 分页查询服务业企业名单
* @param page 分页参数
* @param js 请求体
* @return 分页数据
*/
Page<JServicesList> page(Page<JServicesList> page, JServicesListRequest js);
/**
* 首页服务业数据统计
*/
List<JServicesListCountResponse> selectAllServicesCount();
}

84
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java
Unescape View File

@ -1,21 +1,23 @@
package com.ruoyi.jjh.ent.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.response.HonorResponse;
import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse;
import com.ruoyi.jjh.ent.entity.response.*;
import com.ruoyi.jjh.ent.mapper.JDataScreenMapper;
import com.ruoyi.jjh.ent.service.JDataScreenService;
import com.ruoyi.jjh.ent.service.JProjectService;
import com.ruoyi.jjh.ent.service.SmsAlertsService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.*;
import static java.util.stream.Collectors.collectingAndThen;
import static java.util.stream.Collectors.toCollection;
/**
* 数据大屏业务处理层
*
* @author du
* @since 2024/5/13 9:58
*/
@ -29,29 +31,29 @@ public class JDataScreenImpl implements JDataScreenService {
private JProjectService jProjectService;
/**
* 荣誉情况
*
* @return 所有数据
*/
@Override
public List<HonorResponse> getHonor() {
int x = 0;
for (JProject jp : jProjectService.lambdaQuery().eq(JProject::getProjectMiddleType,4).list()) {
if("否".equals(JSONObject.parseObject(jp.getOtherJson()).get("是否通过2022年度“331”评价"))){
x+=1;
for (JProject jp : jProjectService.lambdaQuery().eq(JProject::getProjectMiddleType, 4).list()) {
if ("否".equals(JSONObject.parseObject(jp.getOtherJson()).get("是否通过2022年度“331”评价"))) {
x += 1;
}
}
List<HonorResponse> honor = jDataScreenMapper.getHonor();
for (HonorResponse y : honor) {
if(y.getProjectBigType()==4){
y.setCount1(y.getCount1()-x);
if (y.getProjectBigType() == 4) {
y.setCount1(y.getCount1() - x);
}
if(y.getProjectMiddleType()==4){
y.setCount2(y.getCount2()-x);
if (y.getProjectMiddleType() == 4) {
y.setCount2(y.getCount2() - x);
}
if(y.getProjectSmallType()==6){
y.setCount3(y.getCount3()-x);
if (y.getProjectSmallType() == 6) {
y.setCount3(y.getCount3() - x);
}
}
return honor;
@ -59,10 +61,62 @@ public class JDataScreenImpl implements JDataScreenService {
/**
* 项目追踪情况
*
* @return 所有数据
*/
@Override
public List<ProjectTrackingResponse> getProjectTracking() {
return jDataScreenMapper.getProjectTracking();
}
/**
* 服务业发展总览
*
* @return 所有数据
*/
@Override
public List<JServicesDevelopResponse> servicesDevelop(Integer type) {
return jDataScreenMapper.servicesDevelop(type);
}
/**
* 行业纵深情况
*
* @return 所有数据
*/
@Override
public List<JIndustryDepthResponse> getIndustryDepth() {
List<JIndustryDepthResponse> list = jDataScreenMapper.getIndustryDepth();
list.forEach(x -> {
x.setYearRevenue(x.getYearRevenue() / 10000.0);
x.setAddValue(x.getAddValue() / 10000.0);
});
return list;
}
/**
* 所有分行业汇总
*
* @return 所有数据
*/
@Override
public List<JAllIndustryResponse> getAllIndustry() {
//获取中类数据
List<JBigMiddleIndustryResponse> list2 = jDataScreenMapper.getMiddleIndustry();
//获取大类数据
List<JAllIndustryResponse> all = jDataScreenMapper.getBigIndustry();
// 向每个 JAllIndustryResponse 对象的 children 字段中添加数据
all.forEach(allResponse -> {
List<JAllIndustryResponse> children = new ArrayList<>();
list2.forEach(middleResponse -> {
if (allResponse.getNameType().equals(middleResponse.getCategories())) {
JAllIndustryResponse child = new JAllIndustryResponse();
BeanUtil.copyProperties(middleResponse, child);
children.add(child);
}
});
allResponse.setChildren(children);
});
return all;
}
}

39
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JHeadQuartersRevenueServiceImpl.java
Unescape View File

@ -0,0 +1,39 @@
package com.ruoyi.jjh.ent.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
import com.ruoyi.jjh.ent.mapper.JHeadQuartersRevenueMapper;
import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService;
import org.springframework.stereotype.Service;
/**
* 总部企业（j_headquarters_revenue）表业务实现层
* @author du
* @since 2024/7/29 13:11
*/
@Service
public class JHeadQuartersRevenueServiceImpl extends ServiceImpl<JHeadQuartersRevenueMapper, JHeadQuartersRevenue> implements JHeadQuartersRevenueService {
/**
* 分页查询总部企业
* @param page 分页参数
* @param js 请求参数
* @return 数据
*/
@Override
public Page<JHeadQuartersRevenue> page(Page<JHeadQuartersRevenue> page, JHeadQuartersRevenueRequest js) {
return baseMapper.page(page,js);
}
/**
* 查询总部企业数量
*/
@Override
public JHqCountResponse selectZbCount() {
return baseMapper.selectZbCount();
}
}

44
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java
Unescape View File

@ -0,0 +1,44 @@
package com.ruoyi.jjh.ent.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import com.ruoyi.jjh.ent.mapper.JServicesListMapper;
import com.ruoyi.jjh.ent.service.JServicesListService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 服务业企业名单（j_services_list）表业务实现层
* @author du
* @since 2024/7/26 15:36
*/
@Service
public class JServicesListServiceImpl extends ServiceImpl<JServicesListMapper, JServicesList> implements JServicesListService {
/**
* 分页查询服务业企业名单
* @param page 分页参数
* @param js 请求体
* @return 分页数据
*/
@Override
public Page<JServicesList> page(Page<JServicesList> page, JServicesListRequest js) {
return baseMapper.page(page,js);
}
/**
* 首页服务业数据统计
*/
@Override
public List<JServicesListCountResponse> selectAllServicesCount() {
//获取四个服务的总数据
List<JServicesListCountResponse> list = baseMapper.selectAllServicesCount();
//获取总部企业的总数居
list.add(baseMapper.selectAllZbCount());
return list;
}
}

258
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
Unescape View File

@ -1,130 +1,130 @@
package com.ruoyi.web.core.config;
import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.Contact;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.service.SecurityScheme;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
/**
* Swagger2的接口配置
*
* @author ruoyi
*/
@Configuration
public class SwaggerConfig {
/**
* 系统基础配置
*/
@Autowired
private RuoYiConfig ruoyiConfig;
/**
* 是否开启swagger
*/
@Value("${knife4j.enable}")
private boolean enabled;
/**
* 设置请求的统一前缀
*/
@Value("${server.servlet.context-path}")
private String pathMapping;
/**
* 创建API
*/
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.OAS_30)
// 是否启用Swagger
.enable(enabled)
// 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
.apiInfo(apiInfo())
// 设置哪些接口暴露给Swagger展示
.select()
// 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解
// .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
// 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any())
.build()
/* 设置安全模式，swagger可以设置访问token */
// .securitySchemes(securitySchemes())
.securityContexts(securityContexts())
.pathMapping(pathMapping)
// 排除mybatis-plus的分页参数
.ignoredParameterTypes(Page.class, IPage.class);
}
/**
* 安全模式，这里指定token通过Authorization头请求头传递
*/
// private List<SecurityScheme> securitySchemes() {
// List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
// apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
// return apiKeyList;
//package com.ruoyi.web.core.config;
//
//import java.util.ArrayList;
//import java.util.List;
//
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import com.ruoyi.common.config.RuoYiConfig;
//import io.swagger.annotations.ApiOperation;
//import io.swagger.models.auth.In;
//import springfox.documentation.builders.ApiInfoBuilder;
//import springfox.documentation.builders.PathSelectors;
//import springfox.documentation.builders.RequestHandlerSelectors;
//import springfox.documentation.service.ApiInfo;
//import springfox.documentation.service.ApiKey;
//import springfox.documentation.service.AuthorizationScope;
//import springfox.documentation.service.Contact;
//import springfox.documentation.service.SecurityReference;
//import springfox.documentation.service.SecurityScheme;
//import springfox.documentation.spi.DocumentationType;
//import springfox.documentation.spi.service.contexts.SecurityContext;
//import springfox.documentation.spring.web.plugins.Docket;
//
///**
// * Swagger2的接口配置
// *
// * @author ruoyi
// */
//@Configuration
//public class SwaggerConfig {
// /**
// * 系统基础配置
// */
// @Autowired
// private RuoYiConfig ruoyiConfig;
//
// /**
// * 是否开启swagger
// */
// @Value("${knife4j.enable}")
// private boolean enabled;
//
// /**
// * 设置请求的统一前缀
// */
// @Value("${server.servlet.context-path}")
// private String pathMapping;
//
// /**
// * 创建API
// */
// @Bean
// public Docket createRestApi() {
// return new Docket(DocumentationType.OAS_30)
// // 是否启用Swagger
// .enable(enabled)
// // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
// .apiInfo(apiInfo())
// // 设置哪些接口暴露给Swagger展示
// .select()
// // 扫描所有有注解的api，用这种方式更灵活
// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// // 扫描指定包中的swagger注解
// // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
// // 扫描所有 .apis(RequestHandlerSelectors.any())
// .paths(PathSelectors.any())
// .build()
// /* 设置安全模式，swagger可以设置访问token */
//// .securitySchemes(securitySchemes())
// .securityContexts(securityContexts())
// .pathMapping(pathMapping)
// // 排除mybatis-plus的分页参数
// .ignoredParameterTypes(Page.class, IPage.class);
// }
/**
* 安全上下文
*/
private List<SecurityContext> securityContexts() {
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(
SecurityContext.builder()
.securityReferences(defaultAuth())
.operationSelector(o -> o.requestMappingPattern().matches("/.*"))
.build());
return securityContexts;
}
/**
* 默认的安全上引用
*/
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
return securityReferences;
}
/**
* 添加摘要信息
*/
private ApiInfo apiInfo() {
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
.title("金鸡湖品牌管理")
// 描述
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
// 作者信息
.contact(new Contact(ruoyiConfig.getName(), null, null))
// 版本
.version("版本号:" + ruoyiConfig.getVersion())
.build();
}
}
//
// /**
// * 安全模式，这里指定token通过Authorization头请求头传递
// */
//// private List<SecurityScheme> securitySchemes() {
//// List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
//// apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
//// return apiKeyList;
//// }
//
// /**
// * 安全上下文
// */
// private List<SecurityContext> securityContexts() {
// List<SecurityContext> securityContexts = new ArrayList<>();
// securityContexts.add(
// SecurityContext.builder()
// .securityReferences(defaultAuth())
// .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
// .build());
// return securityContexts;
// }
//
// /**
// * 默认的安全上引用
// */
// private List<SecurityReference> defaultAuth() {
// AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
// AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
// authorizationScopes[0] = authorizationScope;
// List<SecurityReference> securityReferences = new ArrayList<>();
// securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
// return securityReferences;
// }
//
// /**
// * 添加摘要信息
// */
// private ApiInfo apiInfo() {
// // 用ApiInfoBuilder进行定制
// return new ApiInfoBuilder()
// // 设置标题
// .title("金鸡湖品牌管理")
// // 描述
// .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
// // 作者信息
// .contact(new Contact(ruoyiConfig.getName(), null, null))
// // 版本
// .version("版本号:" + ruoyiConfig.getVersion())
// .build();
// }
//}

4
ruoyi-admin/src/main/resources/application-druid.yml
Unescape View File

@ -62,8 +62,8 @@ spring:
config:
multi-statement-allow: true
#自己客户端地址
returnUrl: http://39.101.188.84:9999/demo/JinJiHu
#returnUrl: http://192.168.0.111:80
#returnUrl: http://39.101.188.84:9999/demo/JinJiHu
returnUrl: http://192.168.0.115:80
#定时任务更新企业信息和联系人的开启
isTiming: false

3
ruoyi-admin/src/main/resources/application-internet.yml
Unescape View File

@ -109,6 +109,9 @@ spring:
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
knife4j:
#true会关闭文档
production: false
#自己客户端地址
returnUrl: https://idp.sipac.gov.cn/bms
#定时任务更新企业信息和联系人的开启

4
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -94,11 +94,9 @@ pagehelper:
supportMethodsArguments: true
params: count=countSql
# 文档配置
knife4j:
# 开启增强配置
# production: true
enable: true
# 防止XSS攻击
xss:
# 过滤开关

136
ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
Unescape View File

@ -40,66 +40,7 @@
<include refid="selectBmsDeclarationRecordsVo"/>
where id = #{id}
</select>
<select id="approvalList" parameterType="com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto"
resultType="com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo">
SELECT
d.approval_status,
a.matter,
c.qymc as enterpriseName,
c.id as enterpriseId,
a.create_time,
a.`status`,
a.template_record_id,
a.detail_id,
a.id as declarationRecordsId,
e.template_id,
e.enterprise_directory,
i.level,
i.responsibility_unit,
d.approval_time
FROM
bms_declaration_records a
INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.tyshxydm
INNER JOIN bms_template_record e on a.template_record_id = e.id
INNER JOIN bms_template_info i on e.template_id = i.id
INNER JOIN bms_approval_info d on a.id=d.declaration_records_id and is_before_data = 0
<where>
<if test="enterpriseDirectory != null and enterpriseDirectory != ''">and e.enterprise_directory like concat('%', #{enterpriseDirectory},
'%')
</if>
<if test="enterpriseName != null and enterpriseName != ''">and c.qymc like concat('%',
#{enterpriseName}, '%')
</if>
<if test="matter != null and matter != ''">and a.matter like concat('%', #{matter}, '%')</if>
<if test="status != null ">and a.status = #{status}</if>
<if test="approvalDept != null">
and d.approval_dept = #{approvalDept}
</if>
<if test="startTime != null ">
and date_format(a.create_time ,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if>
<if test="endTime != null ">
and date_format(a.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
<if test="userIds != null and userIds.size>0">
and a.id in (select declaration_records_id from bms_approval_info d
inner join bms_process_info e on d.process_id = e.id
where is_before_data = 0 and approval_by_id in
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
#{userId}
</foreach>
)
</if>
<if test="approvalStatusStr != null and approvalStatusStr.size >0">
and d.approval_status in
<foreach collection="approvalStatusStr" item="approvalStatus" separator="," open="(" close=")">
#{approvalStatus}
</foreach>
</if>
</where>
ORDER BY FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),
d.approval_time DESC,a.create_time desc
</select>
<select id="selectBmsDeclarationRecordsZwList"
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo">
SELECT
@ -151,19 +92,7 @@
</where>
order by e.dict_sort desc,a.update_time desc,a.create_time desc
</select>
<select id="selectMunicipalBureauReviewList"
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo">
SELECT a.id,
b.credit_code,
b.qymc as enterpriseName,
a.project_name,
a.YEAR,
'' as result,
'' as opinion
FROM bms_declaration_records a
INNER JOIN bms_enterprise_basic_info b ON a.enterprise_id = b.id
WHERE a.`status` = 4
</select>
<select id="selectDeclarationRecordsToIdList"
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo">
SELECT
@ -299,6 +228,67 @@
WHERE
a.id = #{id}
</select>
<select id="approvalList"
resultType="com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo">
SELECT
IF
( s.approval_status = 0, 0, NULL ) AS approvalStatus,
e.enterprise_directory,
i.LEVEL,
i.responsibility_unit,
c.qymc AS enterpriseName,
c.id AS enterpriseId,
a.create_time,
a.`status`,
a.template_record_id,
e.template_id,
a.id AS declarationRecordsId
FROM
bms_declaration_records a
INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.tyshxydm
INNER JOIN bms_template_record e ON a.template_record_id = e.id
INNER JOIN bms_template_info i ON e.template_id = i.id
INNER JOIN (
SELECT
a.*
FROM
bms_approval_info a
JOIN ( SELECT declaration_records_id, max( sort ) AS max_sort FROM bms_approval_info
<where>
<if test="approvalDept != null">
approval_dept = #{approvalDept}
</if>
</where>
GROUP BY declaration_records_id ) b ON a.declaration_records_id = b.declaration_records_id
AND a.sort = b.max_sort
) AS s ON a.id = s.declaration_records_id
AND is_before_data = 0
<where>
<if test="enterpriseDirectory != null and enterpriseDirectory != ''">and e.enterprise_directory like
concat('%', #{enterpriseDirectory},
'%')
</if>
<if test="enterpriseName != null and enterpriseName != ''">and c.qymc like concat('%',
#{enterpriseName}, '%')
</if>
<if test="status != null ">and a.status = #{status}</if>
<if test="startTime != null ">
and date_format(a.create_time ,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if>
<if test="endTime != null ">
and date_format(a.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
<if test="approvalStatusStr != null and approvalStatusStr.size >0">
and s.approval_status in
<foreach collection="approvalStatusStr" item="approvalStatus" separator="," open="(" close=")">
#{approvalStatus}
</foreach>
</if>
</where>
ORDER BY FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),
a.create_time desc
</select>
<insert id="insertBmsDeclarationRecords" parameterType="com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords"

46
ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateInfoMapper.xml
Unescape View File

@ -3,27 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jjh.declaration.mapper.BmsTemplateInfoMapper">
<select id="templateInfoList" parameterType="com.ruoyi.jjh.declaration.entity.BmsTemplateInfo"
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateInfoQueryVo">
SELECT
a.*,
b.nick_name as createByName
FROM
bms_template_info a
INNER JOIN sys_user b ON a.create_by = b.user_id
<where>
<if test="templateName != null and templateName != ''">and a.template_name like concat('%',
#{templateName}, '%')
</if>
<if test="projectBigType != null ">and a.project_big_type = #{projectBigType}</if>
<if test="projectMiddleType != null ">and a.project_middle_type = #{projectMiddleType}</if>
<if test="projectSmallType != null ">and a.project_small_type = #{projectSmallType}</if>
<if test="responsibilityUnit != null ">and a.responsibility_unit = #{responsibilityUnit}</if>
<if test="status != null ">and a.status = #{status}</if>
<if test="isDeleted != null ">and is_deleted = #{isDeleted}</if>
</where>
</select>
<delete id="deleteBmsTemplateInfoById" parameterType="Long">
delete
@ -37,4 +16,29 @@
#{id}
</foreach>
</delete>
<select id="templateInfoList"
resultType="com.ruoyi.jjh.declaration.entity.BmsTemplateInfo">
SELECT
a.*
FROM
bms_template_info a
<where>
<if test="req.templateName != null and req.templateName != ''">and a.template_name like concat('%',
#{req.templateName}, '%')
</if>
<if test="req.projectBigType != null ">and a.project_big_type = #{req.projectBigType}</if>
<if test="req.projectMiddleType != null ">and a.project_middle_type = #{req.projectMiddleType}</if>
<if test="req.projectSmallType != null ">and a.project_small_type = #{req.projectSmallType}</if>
<if test="req.responsibilityUnit != null ">and a.responsibility_unit = #{req.responsibilityUnit}</if>
<if test="req.status != null ">and a.status = #{req.status}</if>
<if test="req.isDeleted != null ">and is_deleted = #{req.isDeleted}</if>
</where>
</select>
<select id="selectByIdOne" resultType="com.ruoyi.jjh.declaration.entity.BmsTemplateInfo">
SELECT
a.*
FROM
bms_template_info a
where a.id = #{ids}
</select>
</mapper>

145
ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml
Unescape View File

@ -4,118 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper">
<resultMap type="com.ruoyi.jjh.declaration.entity.BmsTemplateRecord" id="BmsTemplateRecordResult">
<result property="id" column="id"/>
<result property="templateId" column="template_id"/>
<result property="enterpriseDirectory" column="enterprise_directory"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="fileName" column="file_name"/>
<result property="road" column="road"/>
<result property="notes" column="notes"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="status" column="remark"/>
</resultMap>
<sql id="selectBmsTemplateRecordVo">
select id,
template_id,
enterprise_directory,
start_time,
end_time,
file_name,
road,
notes,
status,
create_by,
create_time,
update_by,
update_time,
remark
from bms_template_record
</sql>
<select id="selectBmsTemplateRecordList" parameterType="com.ruoyi.jjh.declaration.entity.BmsTemplateRecord"
resultMap="BmsTemplateRecordResult">
<include refid="selectBmsTemplateRecordVo"/>
<where>
<if test="templateId != null ">and template_id = #{templateId}</if>
<if test="enterpriseDirectory != null and enterpriseDirectory != ''">and enterprise_directory =
#{enterpriseDirectory}
</if>
<if test="startTime != null ">and start_time = #{startTime}</if>
<if test="endTime != null ">and end_time = #{endTime}</if>
<if test="road != null ">and road = #{road}</if>
<if test="fileName != null ">and file_name = #{fileName}</if>
<if test="notes != null and notes != ''">and notes = #{notes}</if>
<if test="status != null and status != ''">and status = #{status}</if>
</where>
order by create_time desc
</select>
<select id="selectBmsTemplateRecordById" parameterType="Long" resultMap="BmsTemplateRecordResult">
<include refid="selectBmsTemplateRecordVo"/>
where id = #{id}
</select>
<insert id="insertBmsTemplateRecord" parameterType="com.ruoyi.jjh.declaration.entity.BmsTemplateRecord"
useGeneratedKeys="true" keyProperty="id">
insert into bms_template_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="templateId != null">template_id,</if>
<if test="enterpriseDirectory != null">enterprise_directory,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
<if test="road != null">road,</if>
<if test="fileName != null">file_name,</if>
<if test="notes != null">notes,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateId != null">#{templateId},</if>
<if test="enterpriseDirectory != null">#{enterpriseDirectory},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="road != null">#{road},</if>
<if test="fileName != null">#{fileName},</if>
<if test="notes != null">#{notes},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
<update id="updateBmsTemplateRecord" parameterType="com.ruoyi.jjh.declaration.entity.BmsTemplateRecord">
update bms_template_record
<trim prefix="SET" suffixOverrides=",">
<if test="templateId != null">template_id = #{templateId},</if>
<if test="enterpriseDirectory != null">enterprise_directory = #{enterpriseDirectory},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="road != null">road = #{road},</if>
<if test="fileName != null">file_name = #{fileName},</if>
<if test="notes != null">notes = #{notes},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</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="status != null">status = #{status},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBmsTemplateRecordById" parameterType="Long">
delete
@ -144,7 +32,6 @@
a.file_name,
a.start_time,
a.end_time,
a.notes,
b.responsibility_unit,
a.create_time,
c.nick_name as createByName
@ -180,7 +67,7 @@
a.end_time,
a.file_name,
a.road,
a.notes,
a.status,
a.create_by,
a.create_time,
@ -195,21 +82,20 @@
inner JOIN bms_template_info b ON a.template_id = b.id
where a.id = #{id}
</select>
<select id="selectBmsTemplateNameList" parameterType="com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto"
resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo">
SELECT a.template_record_id,
b.template_id,
c.template_name,
c.notes
FROM bms_enterprise_directory a
INNER JOIN bms_template_record b ON a.template_record_id = b.id
INNER JOIN bms_template_info c ON b.template_id = c.id
WHERE b.start_time &lt;= NOW()
AND b.end_time &gt;= NOW()
AND a.credit_code = #{creditCode}
AND c.responsibility_unit = #{responsibilityUnit}
and b.road = 0
</select>
<!-- <select id="selectBmsTemplateNameList" parameterType="com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto"-->
<!-- resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo">-->
<!-- SELECT a.template_record_id,-->
<!-- b.template_id,-->
<!-- c.template_name-->
<!-- FROM bms_enterprise_directory a-->
<!-- INNER JOIN bms_template_record b ON a.template_record_id = b.id-->
<!-- INNER JOIN bms_template_info c ON b.template_id = c.id-->
<!-- WHERE b.start_time &lt;= NOW()-->
<!-- AND b.end_time &gt;= NOW()-->
<!-- AND a.credit_code = #{creditCode}-->
<!-- AND c.responsibility_unit = #{responsibilityUnit}-->
<!-- and b.road = 0-->
<!-- </select>-->
<select id="selectTemplateRecordList" resultType="com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo">
SELECT a.id AS templateRecordId,
b.template_name,
@ -219,7 +105,6 @@
a.file_name,
a.start_time,
a.end_time,
a.notes,
b.responsibility_unit
FROM bms_template_record a
LEFT JOIN bms_template_info b on a.template_id = b.id

75
ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
Unescape View File

@ -65,5 +65,78 @@
order by
count desc
</select>
<select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse">
SELECT
a.develop_year,
IFNULL(a.quarterly,0) as quarterly,
IFNULL(a.value_added,0) as valueAdded,
IFNULL(a.increase_speed,0) as increaseSpeed,
IFNULL(a.gdp_proportion,0) as gdpProportion
FROM
j_services_develop a
<where>
<if test="type == 1 ">
YEAR(NOW()) > a.develop_year
</if>
<if test="type != 1 ">
YEAR(NOW()) = a.develop_year
</if>
</where>
ORDER BY
a.develop_year ASC
LIMIT 5
</select>
<select id="getIndustryDepth" resultType="com.ruoyi.jjh.ent.entity.response.JIndustryDepthResponse">
SELECT
a.years,
a.industry_categories,
IFNULL(a.year_revenue,0) as yearRevenue,
IFNULL(a.add_value,0) as addValue,
IFNULL(a.growth,0) as growth,
IFNULL(a.gdp_proportion,0) as gdpProportion
FROM
j_industry_depth a
WHERE
a.years = YEAR (NOW())-1
</select>
<select id="getMiddleIndustry"
resultType="com.ruoyi.jjh.ent.entity.response.JBigMiddleIndustryResponse">
SELECT
a.categories,
a.middle as nameType,
ROUND( SUM( IFNULL( b.year_revenue, 0 ))/ 10000, 3 ) AS yearRevenue,
ROUND( SUM( IFNULL( b.add_value, 0 ))/ 10000, 3 ) AS addValue,
IFNULL( b.growth, 0 ) AS growth,
IFNULL( b.gdp_proportion, 0 ) AS gdpProportion
FROM
j_industry_dictionary a
LEFT JOIN j_small_industry b ON a.middle_code = LEFT ( b.small_code, 2 )
WHERE
b.years = YEAR (
NOW())- 1 || b.years IS NULL
GROUP BY
a.middle,
a.categories,
b.growth,
b.gdp_proportion
</select>
<select id="getBigIndustry" resultType="com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse">
SELECT
a.categories AS nameType,
ROUND( SUM( IFNULL( b.year_revenue, 0 ))/ 10000, 3 ) AS yearRevenue,
ROUND( SUM( IFNULL( b.add_value, 0 ))/ 10000, 3 ) AS addValue,
IFNULL( b.growth, 0 ) AS growth,
IFNULL( b.gdp_proportion, 0 ) AS gdpProportion
FROM
j_industry_dictionary a
LEFT JOIN j_small_industry b ON a.middle_code = LEFT ( b.small_code, 2 )
WHERE
b.years = YEAR (
NOW())- 1 || b.years IS NULL
GROUP BY
a.categories,
b.growth,
b.gdp_proportion
ORDER BY a.middle_code ASC
</select>
</mapper>

89
ruoyi-admin/src/main/resources/mapper/jjh/ent/JHeadQuartersRevenueMapper.xml
Unescape View File

@ -0,0 +1,89 @@
<?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.jjh.ent.mapper.JHeadQuartersRevenueMapper">
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue">
SELECT
a.qymc,
a.tyshxydm,
CASE
WHEN a.hydm REGEXP '^(06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)' THEN '制造业总部'
WHEN a.hydm REGEXP '^(47|48|49|50)' THEN '建筑业总部'
WHEN a.hydm REGEXP '^(51|52|61|62)' THEN '批零住餐总部'
ELSE '服务业总部'
END as type,
a.hydm,
ROUND( IFNULL( a.revenue, 0 )/ 10000, 3 ) AS revenue,
ROUND( IFNULL( a.taxation, 0 )/ 10000, 3 ) AS taxation,
a.years,
IFNULL( a.output, 0 ) AS output,
IFNULL( a.sales, 0 ) AS sales
FROM
(
SELECT
a.*,
b.project_small_type
FROM
j_headquarters_revenue a
LEFT JOIN j_project b ON a.tyshxydm = b.credit_code
WHERE
b.project_middle_type = 1
GROUP BY
a.tyshxydm
) a
<where>
<if test="req.qymc != null and req.qymc != '' ">
and a.qymc like concat('%',#{req.qymc},'%')
</if>
<if test="req.tyshxydm != null and req.tyshxydm != '' ">
and a.tyshxydm = #{req.tyshxydm}
</if>
<if test="req.years != null and req.years != '' ">
and a.years = #{req.years}
</if>
<if test="req.type == 1">
and a.hydm REGEXP '^(06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)'
</if>
<if test="req.type == 2">
and a.hydm REGEXP '^(47|48|49|50)'
</if>
<if test="req.type == 3">
and a.hydm REGEXP '^(51|52|61|62)'
</if>
<if test="req.type == 4">
</if>
<if test="req.type == 5">
and a.hydm not REGEXP '^(51|52|61|62|47|48|49|50|06|07|08|09|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46)'
</if>
<if test="req.projectSmallType != null">
and a.project_small_type = #{req.projectSmallType}
</if>
</where>
</select>
<select id="selectZbCount" resultType="com.ruoyi.jjh.ent.entity.response.JHqCountResponse">
SELECT DISTINCT
SUM(
IF
( a.project_small_type = 1, 1, 0 )) AS count1,
SUM(
IF
( a.project_small_type = 2, 1, 0 )) AS count2,
sum(
IF
( a.project_small_type = 3, 1, 0 )) AS count3
FROM
(
SELECT
a.*,
b.project_small_type
FROM
j_headquarters_revenue a
LEFT JOIN j_project b ON a.tyshxydm = b.credit_code
WHERE
b.project_middle_type = 1
GROUP BY
a.tyshxydm
) AS a
</select>
</mapper>

52
ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
Unescape View File

@ -0,0 +1,52 @@
<?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.jjh.ent.mapper.JServicesListMapper">
<select id="page" resultType="com.ruoyi.jjh.ent.entity.JServicesList">
SELECT
a.*,
ROUND( IFNULL( b.revenue, 0 )/ 100000, 3 ) AS revenue,
b.years
FROM
j_services_list a
LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm
<where>
<if test="req.qymc != null and req.qymc != '' ">
and a.qymc like concat('%',#{req.qymc},'%')
</if>
<if test="req.tyshxydm != null and req.tyshxydm != '' ">
and a.tyshxydm = #{req.tyshxydm}
</if>
<if test="req.servicesType != null and req.servicesType != '' ">
and a.services_type = #{req.servicesType}
</if>
</where>
ORDER BY
a.id
</select>
<select id="selectAllServicesCount"
resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse">
SELECT
a.services_type,
count(*) AS qyCount,
IFNULL( b.add_value, 0 ) AS addValue,
ROUND( SUM( IFNULL( b.revenue, 0 ))/ 100000, 3 ) AS allRevenue
FROM
j_services_list a
LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm
GROUP BY
a.services_type
ORDER BY
a.services_type
</select>
<select id="selectAllZbCount" resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse">
SELECT
5 AS services_type,
count(*) AS qyCount,
ROUND( SUM( IFNULL( taxation, 0 ))/ 100000, 3 ) AS allRevenue,
ROUND( SUM( IFNULL( revenue, 0 ))/ 100000, 3 ) + ROUND( SUM( IFNULL( output, 0 ))/ 100000, 3 ) + ROUND( SUM( IFNULL( sales, 0 ))/ 100000, 3 ) AS addValue
FROM
j_headquarters_revenue
</select>
</mapper>

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
Unescape View File

@ -118,7 +118,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// .antMatchers("/common/**").permitAll()
.antMatchers("/system/chief").permitAll()
.antMatchers("/system/singlelogin/**").permitAll()
// .antMatchers("/jjh/**").permitAll()
.antMatchers("/jjh/**").permitAll()

Write Preview
Loading…
Cancel
Save