增加新模板

wushunjie
杜函宇 5 months ago
parent a57254ac8b
commit 84a979b1df

@ -0,0 +1,123 @@
package com.ruoyi.jjh.declaration.controller;
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.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsUpdateDto;
import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService;
import com.ruoyi.jjh.declaration.service.IBmsOutQuitProductsService;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* 2024退Controller
*
* @author farben
* @date 2023-08-25
*/
@RestController
@Api(tags = "2024年度淘汰落后和退出低端低效产能装备清单")
@RequestMapping("/system/outQuitProducts")
public class BmsOutQuitProductsController extends BaseController {
@Autowired
private IBmsOutQuitProductsService bmsOutQuitProductsService;
@Resource
private JProjectService jProjectService;
/**
* 2024退
*/
@ApiOperation(value = "查询列表")
@GetMapping("/list")
public TableDataInfo list(BmsOutQuitProducts bmsOutQuitProducts) {
startPage();
List<BmsOutQuitProducts> list = bmsOutQuitProductsService.selectBmsOutQuitProductsList(bmsOutQuitProducts);
return getDataTable(list);
}
/**
* 2024退
*/
@ApiOperation(value = "导出列表")
@Log(title = "2024年度淘汰落后和退出低端低效产能装备清单", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BmsOutQuitProducts bmsOutQuitProducts) {
List<BmsOutQuitProducts> list = bmsOutQuitProductsService.selectBmsOutQuitProductsList(bmsOutQuitProducts);
ExcelUtil<BmsOutQuitProducts> util = new ExcelUtil<BmsOutQuitProducts>(BmsOutQuitProducts.class);
util.exportExcel(response, list, "2024年度淘汰落后和退出低端低效产能装备清单数据");
}
/**
* 2024退
*/
@ApiOperation(value = "根据id查询详情")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(bmsOutQuitProductsService.getById(id));
}
/**
* 2024退
*/
@ApiOperation(value = "新增")
@Log(title = "2024年度淘汰落后和退出低端低效产能装备清单", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BmsOutQuitProductsAddDto bmsOutQuitProductsAddDto) {
return toAjax(bmsOutQuitProductsService.insertBmsOutQuitProducts(bmsOutQuitProductsAddDto));
}
/**
* 2024退
*/
@ApiOperation(value = "修改")
@Log(title = "修改2024年度淘汰落后和退出低端低效产能装备清单", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BmsOutQuitProductsUpdateDto bmsOutQuitProductsUpdateDto) {
return toAjax(bmsOutQuitProductsService.updateBmsOutQuitProducts(bmsOutQuitProductsUpdateDto));
}
/**
* 2024退
*/
@ApiOperation(value = "只做修改,不做逻辑")
@Log(title = "修改2024年度淘汰落后和退出低端低效产能装备清单只做修改不做逻辑", businessType = BusinessType.UPDATE)
@PutMapping("/update")
public AjaxResult update(@RequestBody BmsOutQuitProducts bmsOutQuitProducts) {
bmsOutQuitProductsService.updateById(bmsOutQuitProducts);
JProject jps = new JProject();
jps.setId(bmsOutQuitProducts.getJjhProjectId());
jps.setFileJson("{" +
'"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + bmsOutQuitProducts.getSpecifics() + '"' + "," +
'"' + "其他相关情况说明" + '"' + ":" + '"' + bmsOutQuitProducts.getOtherSpecifics() + '"'+
"}");
return toAjax(jProjectService.updateById(jps));
}
/**
* 2024退
*/
@ApiOperation(value = "删除2024年度淘汰落后和退出低端低效产能装备清单")
@Log(title = "删除2024年度淘汰落后和退出低端低效产能装备清单详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsOutQuitProductsService.deleteBmsOutQuitProductsByIds(ids));
}
}

@ -0,0 +1,109 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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;
/**
* 2024退 bms_out_quit_products
*
* @author farben
* @date 2023-08-25
*/
@ApiModel("2024年度淘汰落后和退出低端低效产能装备清单详情对象")
@Data
public class BmsOutQuitProducts extends BaseInfoEntity {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
@JSONField(serialize = false)
private Long id;
/**
* id
*/
@ApiModelProperty("企业id")
@Excel(name = "企业id")
@JSONField(serialize = false)
private Long enterpriseId;
/**
*
*/
@ApiModelProperty("主要产品")
@Excel(name = "主要产品")
@JSONField(name = "主要产品")
private String mainProducts;
/**
* 1 2 3 4 5 6
*/
@ApiModelProperty("所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工")
@JSONField(name = "所属行业")
@Excel(name = "所属行业",readConverterExp = "1=轻工,2=纺织,3=冶金,4=化工,5=建材,6=机械加工")
private Integer industry;
/**
*
*/
@ApiModelProperty("工作联系人")
@Excel(name = "工作联系人")
@JSONField(name = "工作联系人")
private String workContact;
/**
*
*/
@ApiModelProperty("联系电话")
@Excel(name = "联系电话")
@JSONField(name = "联系电话")
private String iphone;
/**
* 1 2 退
*/
@ApiModelProperty("类别 1 淘汰落后生产工艺装备 2 退出低端低效生产工艺装备")
@Excel(name = "类别",readConverterExp = "1=淘汰落后生产工艺装备,2=退出低端低效生产工艺装备")
@JSONField(name = "类别")
private Integer type;
/**
* 退
*/
@ApiModelProperty("拟淘汰或退出生产工艺装备情况(和类别对应)")
@Excel(name = "拟淘汰或退出生产工艺装备情况")
@JSONField(serialize = false)
private String specifics;
/**
*
*/
@ApiModelProperty("其他相关情况说明")
@Excel(name = "其他相关情况说明")
@JSONField(serialize = false)
private String otherSpecifics;
/**
* 01
*/
@ApiModelProperty("是否删除0未删除1已删除")
@JSONField(serialize = false)
@Excel(name = "是否删除0未删除1已删除")
private Long isDeleted;
@TableField(exist=false)
@ApiModelProperty(value = "项目库Id")
private Long jjhProjectId;
}

@ -0,0 +1,66 @@
package com.ruoyi.jjh.declaration.entity.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* 2024退 bms_out_quit_products
*
* @author farben
* @date 2023-08-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BmsOutQuitProductsAddDto extends BmsEnterpriseBasicInfoAddDto implements Serializable {
/**
*
*/
@ApiModelProperty("主要产品")
private String mainProducts;
/**
* 1 2 3 4 5 6
*/
@ApiModelProperty("所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工")
private Integer industry;
/**
*
*/
@ApiModelProperty("工作联系人")
private String workContact;
/**
*
*/
@ApiModelProperty("联系电话")
private String iphone;
/**
* 1 2 退
*/
@ApiModelProperty("类别 1 淘汰落后生产工艺装备 2 退出低端低效生产工艺装备")
private Integer type;
/**
* 退
*/
@ApiModelProperty("拟淘汰或退出生产工艺装备情况(和类别对应)")
private String specifics;
/**
*
*/
@ApiModelProperty("其他相关情况说明")
private String otherSpecifics;
/**
* 线id
*/
@ApiModelProperty(value = "在线申报记录id")
private Long declarationId;
}

@ -0,0 +1,25 @@
package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 2024退 bms_out_quit_products
*
* @author farben
* @date 2023-08-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class BmsOutQuitProductsUpdateDto extends BmsOutQuitProducts {
@ApiModelProperty(value = "记录id")
private Long declarationRecordsId;
@ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过10=初审驳回")
private Long status;
}

@ -1,16 +1,6 @@
package com.ruoyi.jjh.declaration.entity.vo;
import com.ruoyi.jjh.declaration.entity.BmsBrandingAward;
import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward;
import com.ruoyi.jjh.declaration.entity.BmsCreditManagement;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward;
import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries;
import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward;
import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward;
import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward;
import com.ruoyi.jjh.declaration.entity.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -61,4 +51,6 @@ public class DeclarationRecordsVo implements Serializable {
@ApiModelProperty(value = "11、两业融合奖补对象")
private BmsIntegrationIndustries bmsIntegrationIndustries;
@ApiModelProperty(value = "12、2024年度淘汰落后和退出低端低效产能装备清单对象")
private BmsOutQuitProducts bmsOutQuitProducts;
}

@ -0,0 +1,40 @@
package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
import java.util.List;
/**
* 2024退 Mapper
*
* @author farben
* @date 2023-09-04
*/
public interface BmsOutQuitProductsMapper extends BaseMapper<BmsOutQuitProducts> {
/**
* 2024退
*
* @param bmsCreditManagement
* @return
*/
List<BmsOutQuitProducts> selectBmsOutQuitProductsList(BmsOutQuitProducts bmsCreditManagement);
/**
* 2024退
*
* @param id
* @return
*/
int deleteBmsOutQuitProductsById(Long id);
/**
* 2024退
*
* @param ids
* @return
*/
int deleteBmsOutQuitProductsByIds(Long[] ids);
}

@ -90,18 +90,7 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
*/
public int deleteBmsDeclarationRecordsById(Long id);
/**
* by Id
*
* @param id
* @param projectName
* @return {@link int}
* @author emiya.xie
* @create 2023/9/6 15:13
*/
public int updateProjectNameById(Long id, String projectName, Long projectId);
public int updateDeclarationRecords(Long declarationId, Long projectId, String projectName, Long status);
/**
* id使

@ -0,0 +1,67 @@
package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward;
import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import java.util.List;
import java.util.Map;
/**
* 2024退Service
*
* @author farben
* @date 2023-08-25
*/
public interface IBmsOutQuitProductsService extends IService<BmsOutQuitProducts> {
/**
* 2024退
*
* @param bmsOutQuitProducts
* @return
*/
List<BmsOutQuitProducts> selectBmsOutQuitProductsList(BmsOutQuitProducts bmsOutQuitProducts);
/**
* 2024退
*
* @param bmsOutQuitProductsAddDto
* @return
*/
int insertBmsOutQuitProducts(BmsOutQuitProductsAddDto bmsOutQuitProductsAddDto);
/**
* otherJson
*/
Map<String,String> getAllJson(Long id);
/**
* 2024退
*
* @param bmsOutQuitProductsUpdateDto
* @return
*/
int updateBmsOutQuitProducts(BmsOutQuitProductsUpdateDto bmsOutQuitProductsUpdateDto);
/**
* 2024退
*
* @param ids
* @return
*/
int deleteBmsOutQuitProductsByIds(Long[] ids);
/**
* 2024退
*
* @param id
* @return
*/
int deleteBmsOutQuitProductsById(Long id);
}

@ -164,9 +164,11 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
public int updateBmsBigStrongAward(BmsBigStrongAwardUpdateDto bmsBigStrongAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId()
, bmsBigStrongAwardUpdateDto.getProjectId(), bmsBigStrongAwardUpdateDto.getProjectName()
, bmsBigStrongAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsBigStrongAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsBigStrongAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
num = baseMapper.updateBmsBigStrongAward(bmsBigStrongAwardUpdateDto);
List<BmsFundingDetail> fundingDetailList = bmsBigStrongAwardUpdateDto.getFundingDetailList();
iBmsFundingDetailService.saveOrUpdateBatch(fundingDetailList);

@ -142,9 +142,10 @@ public class BmsBrandingAwardServiceImpl extends ServiceImpl<BmsBrandingAwardMap
public int updateBmsBrandingAward(BmsBrandingAwardUpdateDto bmsBrandingAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsBrandingAwardUpdateDto.getDeclarationRecordsId()
,bmsBrandingAwardUpdateDto.getProjectId(),bmsBrandingAwardUpdateDto.getProjectName()
,bmsBrandingAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsBrandingAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsBrandingAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsBrandingAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsBrandingAward(bmsBrandingAwardUpdateDto);

@ -143,9 +143,11 @@ public class BmsCarrierConstructionAwardServiceImpl extends ServiceImpl<BmsCarri
public int updateBmsCarrierConstructionAward(BmsCarrierConstructionAwardUpdateDto bmsCarrierConstructionAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId()
,bmsCarrierConstructionAwardUpdateDto.getProjectId(),bmsCarrierConstructionAwardUpdateDto.getProjectName()
,bmsCarrierConstructionAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsCarrierConstructionAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsCarrierConstructionAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsCarrierConstructionAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsCarrierConstructionAward(bmsCarrierConstructionAwardUpdateDto);
// 申请审批

@ -144,9 +144,10 @@ public class BmsCreditManagementServiceImpl extends ServiceImpl<BmsCreditManagem
public int updateBmsCreditManagement(BmsCreditManagementUpdateDto bmsCreditManagementUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsCreditManagementUpdateDto.getDeclarationRecordsId()
,bmsCreditManagementUpdateDto.getProjectId(),bmsCreditManagementUpdateDto.getProjectName()
,bmsCreditManagementUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsCreditManagementUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsCreditManagementUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsCreditManagementUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsCreditManagement(bmsCreditManagementUpdateDto);

@ -59,6 +59,8 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
@Autowired
private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
@Autowired
private IBmsOutQuitProductsService iBmsOutQuitProductsService;
/**
*
*/
@ -627,32 +629,7 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
return baseMapper.deleteBmsDeclarationRecordsById(id);
}
/**
* by Id
*
* @param id
* @param projectName
* @return {@link int}
* @author emiya.xie
* @create 2023/9/6 15:13
*/
@Override
public int updateProjectNameById(Long id, String projectName, Long projectId) {
return baseMapper.updateProjectNameById(id, projectName, projectId);
}
@Override
public int updateDeclarationRecords(Long declarationId, Long projectId, String projectName, Long status) {
BmsDeclarationRecords bmsDeclarationRecords = baseMapper.selectById(declarationId);
if (bmsDeclarationRecords.getStatus() == 6 || bmsDeclarationRecords.getStatus() == 7 || bmsDeclarationRecords.getStatus() == 8) {
// 被拒绝,将原审批记录修改为拒绝前数据
iBmsApprovalInfoService.updateApproval(declarationId);
}
bmsDeclarationRecords.setProjectId(projectId);
bmsDeclarationRecords.setProjectName(projectName);
bmsDeclarationRecords.setStatus(status);
return baseMapper.updateById(bmsDeclarationRecords);
}
/**
@ -705,7 +682,11 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
ly.getIndependentAccounting() + "," +
ly.getCapitalVerificationReport() + "," +
ly.getOtherEvidence();
}else {
}else if (args == 12) {
BmsOutQuitProducts ly = iBmsOutQuitProductsService.getById(id);
return ly.getSpecifics() + ","+
ly.getOtherSpecifics() + ",";
} else {
return null;
}
}

@ -140,9 +140,10 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl<BmsIndust
public int updateBmsIndustrialInternetAward(BmsIndustrialInternetAwardUpdateDto bmsIndustrialInternetAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId()
,bmsIndustrialInternetAwardUpdateDto.getProjectId(),bmsIndustrialInternetAwardUpdateDto.getProjectName()
,bmsIndustrialInternetAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsIndustrialInternetAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsIndustrialInternetAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsIndustrialInternetAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsIndustrialInternetAward(bmsIndustrialInternetAwardUpdateDto);

@ -149,9 +149,10 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
public int updateBmsIntegrationIndustries(BmsIntegrationIndustriesUpdateDto bmsIntegrationIndustriesUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId()
,bmsIntegrationIndustriesUpdateDto.getProjectId(),bmsIntegrationIndustriesUpdateDto.getProjectName()
,bmsIntegrationIndustriesUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsIntegrationIndustriesUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsIntegrationIndustriesUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsIntegrationIndustriesUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsIntegrationIndustries(bmsIntegrationIndustriesUpdateDto);

@ -42,6 +42,8 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Autowired
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource
@ -146,13 +148,11 @@ public class BmsLogisticsDevelopmentAwardServiceImpl extends ServiceImpl<BmsLogi
public int updateBmsLogisticsDevelopmentAward(BmsLogisticsDevelopmentAwardUpdateDto bmsLogisticsDevelopmentAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId()
,bmsLogisticsDevelopmentAwardUpdateDto.getProjectId(),bmsLogisticsDevelopmentAwardUpdateDto.getProjectName()
,bmsLogisticsDevelopmentAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsLogisticsDevelopmentAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsLogisticsDevelopmentAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
iBmsDeclarationRecordsService.updateProjectNameById(bmsLogisticsDevelopmentAwardUpdateDto.getId()
,bmsLogisticsDevelopmentAwardUpdateDto.getProjectName(),bmsLogisticsDevelopmentAwardUpdateDto.getProjectId());
bmsLogisticsDevelopmentAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardUpdateDto);
// 申请审批
if (bmsLogisticsDevelopmentAwardUpdateDto.getStatus()==1){

@ -143,9 +143,10 @@ public class BmsManufacturingServicesAwardServiceImpl extends ServiceImpl<BmsMan
public int updateBmsManufacturingServicesAward(BmsManufacturingServicesAwardUpdateDto bmsManufacturingServicesAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId()
,bmsManufacturingServicesAwardUpdateDto.getProjectId(),bmsManufacturingServicesAwardUpdateDto.getProjectName()
,bmsManufacturingServicesAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsManufacturingServicesAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsManufacturingServicesAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsManufacturingServicesAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsManufacturingServicesAward(bmsManufacturingServicesAwardUpdateDto);

@ -0,0 +1,167 @@
package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward;
import com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts;
import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsOutQuitProductsUpdateDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsOutQuitProductsMapper;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsOutQuitProductsService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 2024退Service
*
* @author farben
* @date 2023-08-25
*/
@Service
public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProductsMapper,BmsOutQuitProducts> implements IBmsOutQuitProductsService {
@Autowired
private ICommonService iCommonService;
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Resource
private IBmsTemplateInfoService iBmsTemplateInfoService;
@Resource
private JProjectService jProjectService;
/**
* 2024退
*
* @param bmsOutQuitProducts
* @return
*/
@Override
public List<BmsOutQuitProducts> selectBmsOutQuitProductsList(BmsOutQuitProducts bmsOutQuitProducts) {
return baseMapper.selectBmsOutQuitProductsList(bmsOutQuitProducts);
}
/**
* 2024退
*
* @param bmsOutQuitProductsAddDto
* @return
*/
@Override
public int insertBmsOutQuitProducts(BmsOutQuitProductsAddDto bmsOutQuitProductsAddDto) {
Long enterpriseId = iCommonService.checkEnterprise(bmsOutQuitProductsAddDto.getCreditCode()
,bmsOutQuitProductsAddDto.getTemplateRecordId());
// check 申报信息
iCommonService.checkDeclaration(bmsOutQuitProductsAddDto.getCreditCode()
,bmsOutQuitProductsAddDto.getTemplateRecordId());
BmsOutQuitProducts products = new BmsOutQuitProducts();
BeanUtil.copyProperties(bmsOutQuitProductsAddDto,products);
products.setEnterpriseId(enterpriseId);
int num = baseMapper.insert(products);
// 新增申请记录
BmsDeclarationRecords declarationRecords = new BmsDeclarationRecords();
declarationRecords.setMatter("提交2024年度淘汰落后和退出低端低效产能装备清单");
declarationRecords.setDetailId(products.getId());
declarationRecords.setStatus(1L);
declarationRecords.setId(bmsOutQuitProductsAddDto.getDeclarationId());
iBmsDeclarationRecordsService.updateById(declarationRecords);
//新增项目
declarationRecords.setJjhProjectId(jProjectService.saveProject(getAllJson(bmsOutQuitProductsAddDto.getDeclarationId())));
iBmsDeclarationRecordsService.updateById(declarationRecords);
// 生成审核
iCommonService.insertAuditRecord(declarationRecords.getId(),0);
return num;
}
@Override
public Map<String, String> getAllJson(Long id) {
Map<String,String> jsonMap = new HashMap<>();
//获取该申报记录的详情
DeclarationRecordsVo declarationRecordsVo = iBmsDeclarationRecordsService.selectBmsDeclarationRecordsById(id);
//申报的企业信息JSON
String js1= JSONObject.toJSONString(declarationRecordsVo.getBmsEnterpriseBasicInfo());
//在线申报信息JSON
String js2 = JSONObject.toJSONString(declarationRecordsVo.getBmsDeclarationRecords());
//提交2024年度淘汰落后和退出低端低效产能装备清单
BmsOutQuitProducts p1 = declarationRecordsVo.getBmsOutQuitProducts();
//提交2024年度淘汰落后和退出低端低效产能装备清单json
String js3 = JSONObject.toJSONString(p1);
jsonMap.put("credit_code",declarationRecordsVo.getBmsEnterpriseBasicInfo().getCreditCode());
jsonMap.put("projectName",declarationRecordsVo.getBmsDeclarationRecords().getProjectName());
jsonMap.put("year",declarationRecordsVo.getBmsDeclarationRecords().getYear());
jsonMap.put("templateId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getTemplateId()));
jsonMap.put("otherJson",jProjectService.allJsonString(js1, js2, js3, "{}"));
jsonMap.put("fileJson", "{" +
'"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + p1.getSpecifics() + '"' + "," +
'"' + "其他相关情况说明" + '"' + ":" + '"' + p1.getOtherSpecifics() + '"'+
"}");
jsonMap.put("declareUnit",declarationRecordsVo.getBmsEnterpriseBasicInfo().getEnterpriseName());
jsonMap.put("jjhProjectId", String.valueOf(declarationRecordsVo.getBmsDeclarationRecords().getJjhProjectId()));
return jsonMap;
}
@Override
public int updateBmsOutQuitProducts(BmsOutQuitProductsUpdateDto bmsOutQuitProductsUpdateDto) {
int num = 0;
try {
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsOutQuitProductsUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsOutQuitProductsUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
num = baseMapper.updateById(bmsOutQuitProductsUpdateDto);
// 申请审批
if (bmsOutQuitProductsUpdateDto.getStatus()==1){
Map<String, String> allJson = getAllJson(bmsOutQuitProductsUpdateDto.getDeclarationRecordsId());
//修改项目
jProjectService.updateTheJson(allJson);
// 审批状态
iCommonService.updateAuditRecord(bmsOutQuitProductsUpdateDto.getDeclarationRecordsId(), 0);
}
}catch (Exception e){
e.printStackTrace();
}
return num;
}
/**
* 2024退
*
* @param ids
* @return
*/
@Override
public int deleteBmsOutQuitProductsByIds(Long[] ids) {
return baseMapper.deleteBmsOutQuitProductsByIds(ids);
}
/**
* 2024退
*
* @param id
* @return
*/
@Override
public int deleteBmsOutQuitProductsById(Long id) {
return baseMapper.deleteBmsOutQuitProductsById(id);
}
}

@ -144,13 +144,11 @@ public class BmsPlatformConstructionAwardServiceImpl extends ServiceImpl<BmsPlat
public int updateBmsPlatformConstructionAward(BmsPlatformConstructionAwardUpdateDto bmsPlatformConstructionAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId()
,bmsPlatformConstructionAwardUpdateDto.getProjectId(),bmsPlatformConstructionAwardUpdateDto.getProjectName()
,bmsPlatformConstructionAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsPlatformConstructionAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsPlatformConstructionAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
iBmsDeclarationRecordsService.updateProjectNameById(bmsPlatformConstructionAwardUpdateDto.getId()
,bmsPlatformConstructionAwardUpdateDto.getProjectName(),bmsPlatformConstructionAwardUpdateDto.getProjectId());
bmsPlatformConstructionAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num = baseMapper.updateBmsPlatformConstructionAward(bmsPlatformConstructionAwardUpdateDto);
// 申请审批
if (bmsPlatformConstructionAwardUpdateDto.getStatus()==1){

@ -169,9 +169,10 @@ public class BmsProjectSettlementAwardServiceImpl extends ServiceImpl<BmsProject
public int updateBmsProjectSettlementAward(BmsProjectSettlementAwardUpdateDto bmsProjectSettlementAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId()
, bmsProjectSettlementAwardUpdateDto.getProjectId(), bmsProjectSettlementAwardUpdateDto.getProjectName()
, bmsProjectSettlementAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsProjectSettlementAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsProjectSettlementAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
num = baseMapper.updateBmsProjectSettlementAward(bmsProjectSettlementAwardUpdateDto);
List<BmsFundingDetail> fundingDetailList = bmsProjectSettlementAwardUpdateDto.getFundingDetailList();

@ -141,9 +141,10 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
public int updateBmsSceneOpeningAward(BmsSceneOpeningAwardUpdateDto bmsSceneOpeningAwardUpdateDto) {
int num = 0;
try {
iBmsDeclarationRecordsService.updateDeclarationRecords(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId()
,bmsSceneOpeningAwardUpdateDto.getProjectId(),bmsSceneOpeningAwardUpdateDto.getProjectName()
,bmsSceneOpeningAwardUpdateDto.getStatus());
BmsDeclarationRecords newRecord = new BmsDeclarationRecords();
newRecord.setId(bmsSceneOpeningAwardUpdateDto.getDeclarationRecordsId());
newRecord.setStatus(bmsSceneOpeningAwardUpdateDto.getStatus());
iBmsDeclarationRecordsService.updateById(newRecord);
bmsSceneOpeningAwardUpdateDto.setUpdateTime(DateUtils.getNowDate());
num=baseMapper.updateBmsSceneOpeningAward(bmsSceneOpeningAwardUpdateDto);

@ -17,25 +17,7 @@ import com.ruoyi.jjh.declaration.entity.dto.OpenInterfaceApplyAddDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsBigStrongAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsProjectSettlementAwardQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService;
import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService;
import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService;
import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService;
import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService;
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.IBmsFundingDetailService;
import com.ruoyi.jjh.declaration.service.IBmsIndustrialInternetAwardService;
import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService;
import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService;
import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService;
import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService;
import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService;
import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService;
import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.declaration.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -112,7 +94,8 @@ public class CommonServiceImpl implements ICommonService {
@Autowired
private IBmsDeclarationRecordsService iBmsDeclarationRecordsService;
@Autowired
private IBmsOutQuitProductsService iBmsOutQuitProductsService;
/**
*
@ -241,6 +224,9 @@ public class CommonServiceImpl implements ICommonService {
} else if (declarationTemplateType == 11) {
// 两业融合奖补
declarationRecordsVo.setBmsIntegrationIndustries(iBmsIntegrationIndustriesService.selectBmsIntegrationIndustriesById(detailId));
}else if (declarationTemplateType == 12) {
// 两业融合奖补
declarationRecordsVo.setBmsOutQuitProducts(iBmsOutQuitProductsService.getById(detailId));
}
}

@ -60,6 +60,8 @@ public class ChiefController {
JSONObject jsonObj = JSONUtil.parseObj(responseBody);
JSONObject dataObj = jsonObj.getJSONObject("data");
ChiefResponse req = JSONUtil.toBean(dataObj, ChiefResponse.class);
System.out.println(req);
// req.setToken(singleLoginService.singleLogin("1","2",null,"02"));
//判断几个政务端用户
return AjaxResult.success(req);
}

@ -62,5 +62,5 @@ spring:
config:
multi-statement-allow: true
#自己客户端地址
returnUrl: http://39.101.188.84:9999/demo/JinJiHu
#returnUrl: http://192.168.0.105:80/
#returnUrl: http://39.101.188.84:9999/demo/JinJiHu
returnUrl: http://192.168.0.108:80

@ -0,0 +1,28 @@
<?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.declaration.mapper.BmsOutQuitProductsMapper">
<select id="selectBmsOutQuitProductsList" resultType="com.ruoyi.jjh.declaration.entity.BmsOutQuitProducts">
select *
from bms_out_quit_products
<where>
<if test="enterpriseId != null ">and enterprise_id = #{enterpriseId}</if>
<if test="mainProducts != null and mainProducts != ''">and mainProducts =
#{mainProducts}
</if>
</where>
</select>
<delete id="deleteBmsOutQuitProductsById">
delete
from bms_out_quit_products
where id = #{id}
</delete>
<delete id="deleteBmsOutQuitProductsByIds">
delete from bms_out_quit_products where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save