增加json字典

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java

@@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
 import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +29,7 @@ import java.util.List;
  * @author farben
  * @date 2023-08-31
  */
+@Api(tags = "企业名录")
 @RestController
 @RequestMapping("/system/enterpriseDirectory")
 public class BmsEnterpriseDirectoryController extends BaseController {
@@ -37,6 +40,7 @@ public class BmsEnterpriseDirectoryController extends BaseController {
      * 查询企业名录列表
      */
 //    @RequiresPermissions("system:enterpriseDirectory:list")
+    @ApiOperation(value = "查询企业名录列表")
     @GetMapping("/list")
     public TableDataInfo list(BmsEnterpriseDirectory bmsEnterpriseDirectory) {
         startPage();
@@ -48,9 +52,10 @@ public class BmsEnterpriseDirectoryController extends BaseController {
      * 导出企业名录列表
      */
 //    @RequiresPermissions("system:enterpriseDirectory:export")
+    @ApiOperation(value = "导出企业名录列表")
     @Log(title = "企业名录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BmsEnterpriseDirectory bmsEnterpriseDirectory) {
+    public void export(HttpServletResponse response,@RequestBody BmsEnterpriseDirectory bmsEnterpriseDirectory) {
         List<BmsEnterpriseDirectory> list = bmsEnterpriseDirectoryService.selectBmsEnterpriseDirectoryList(bmsEnterpriseDirectory);
         ExcelUtil<BmsEnterpriseDirectory> util = new ExcelUtil<BmsEnterpriseDirectory>(BmsEnterpriseDirectory.class);
         util.exportExcel(response, list, "企业名录数据");

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java

@@ -53,10 +53,17 @@ public class BmsBigStrongAward extends BaseInfoEntity {
      * 园区其他经营奖励
      */
     @ApiModelProperty("园区其他经营奖励")
-    @JSONField(name  = "园区其他经营奖励")
+    @JSONField(serialize = false)
-    @Excel(name = "奖励说明")
+    @Excel(name = "园区其他经营奖励",readConverterExp = "0=是,1=否")
     private String rewardDescription;
 
+    /**
+     * 园区其他经营奖励
+     */
+    @TableField(exist=false)
+    @JSONField(name  = "园区其他经营奖励")
+    private String newRewardDescription;
+
     /**
      * 成立时间
      */

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java

@@ -43,9 +43,9 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
     /**
      * 分类 1.规上 2规下
      */
-    @ApiModelProperty("分类 1.规上 2规下")
+    @ApiModelProperty("分类 1.规上服务业 2其他")
     @JSONField(serialize=false)
-    @Excel(name = "分类",readConverterExp = "1=规上,2=规下")
+    @Excel(name = "分类",readConverterExp = "1=规上服务业,2=其他")
     private Integer type;
 
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java

@@ -39,10 +39,14 @@ public class BmsIntegrationIndustries extends BaseInfoEntity {
     private Long enterpriseId;
 
     @ApiModelProperty("申报类型")
-    @JSONField(name = "申报类型")
+    @JSONField(serialize = false)
     @Excel(name = "申报类型", readConverterExp = "1=两业融合示范企业,2=制造业企业设立财务独立核算的制造服务业职能部门,3=制造业企业剥离服务业务成立独立的法人")
     private Integer declarationType;
 
+    @JSONField(name = "申报类型")
+    @TableField(exist=false)
+    private String newDeclarationType;
+
     /**
      * 证明材料
      */

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsOutQuitProducts.java

@@ -48,10 +48,17 @@ public class BmsOutQuitProducts extends BaseInfoEntity {
      * 所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工
      */
     @ApiModelProperty("所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工")
-    @JSONField(name  = "所属行业")
+    @JSONField(serialize = false)
     @Excel(name = "所属行业",readConverterExp = "1=轻工,2=纺织,3=冶金,4=化工,5=建材,6=机械加工")
     private Integer industry;
 
+    /**
+     * 所属行业 1轻工 2纺织 3冶金 4化工 5建材 6机械加工
+     */
+    @TableField(exist=false)
+    @JSONField(name  = "所属行业")
+    private String newIndustry;
+
     /**
      * 工作联系人
      */
@@ -74,9 +81,16 @@ public class BmsOutQuitProducts extends BaseInfoEntity {
      */
     @ApiModelProperty("类别 1 淘汰落后生产工艺装备 2 退出低端低效生产工艺装备")
     @Excel(name = "类别",readConverterExp = "1=淘汰落后生产工艺装备,2=退出低端低效生产工艺装备")
-    @JSONField(name = "类别")
+    @JSONField(serialize = false)
     private Integer type;
 
+    /**
+     * 类别 1 淘汰落后生产工艺装备 2 退出低端低效生产工艺装备
+     */
+    @JSONField(name = "类别")
+    @TableField(exist=false)
+    private String newType;
+
     /**
      * 拟淘汰或退出生产工艺装备情况（和类别对应）
      */

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java

@@ -52,10 +52,17 @@ public class BmsSceneOpeningAward extends BaseInfoEntity {
      * 所属类型
      */
     @ApiModelProperty("所属类型")
-    @JSONField(name = "所属类型")
+    @JSONField(serialize=false)
-    @Excel(name = "所属类型")
+    @Excel(name = "所属类型",readConverterExp = "0=市场服务类,1=公共服务类")
     private Long type;
 
+    /**
+     * 所属类型
+     */
+    @JSONField(name = "所属类型")
+    @TableField(exist=false)
+    private String newType;
+
     /**
      * 公示、发文证明、专家评分表
      */

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java

@@ -120,6 +120,11 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl<BmsBigStrongAwardM
         String jsonString = jProjectService.getJsonString(fundingInfoList);
         JSONObject mergedObj = new JSONObject();
         mergedObj.putAll(JSONObject.parseObject(jsonString));
+        if (bmsBigStrongAward.getIsGainRewards() == 0) {
+            bmsBigStrongAward.setNewRewardDescription("是");
+        } else {
+            bmsBigStrongAward.setNewRewardDescription("否");
+        }
         mergedObj.putAll(JSONObject.parseObject(JSONObject.toJSONString(bmsBigStrongAward)));
         addProject.setOtherJson(mergedObj.toJSONString());
         addProject.setFileJson("{" +

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIntegrationIndustriesServiceImpl.java

@@ -99,6 +99,13 @@ public class BmsIntegrationIndustriesServiceImpl extends ServiceImpl<BmsIntegrat
         //获取某个在线记录id可以添加到项目库的数据
         JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsIntegrationIndustriesAddDto.getDeclarationId());
         addProject.setStatus(1);
+        if(bmsIntegrationIndustries.getDeclarationType() == 1){
+            bmsIntegrationIndustries.setNewDeclarationType("两业融合示范企业");
+        }else if(bmsIntegrationIndustries.getDeclarationType() == 2){
+            bmsIntegrationIndustries.setNewDeclarationType("制造业企业设立财务独立核算的制造服务业职能部门");
+        }else if(bmsIntegrationIndustries.getDeclarationType() == 3){
+            bmsIntegrationIndustries.setNewDeclarationType("制造业企业剥离服务业务成立独立的法人");
+        }
         addProject.setOtherJson(JSONObject.toJSONString(bmsIntegrationIndustries));
         addProject.setFileJson("{" +
                 '"' + "证明材料" + '"' + ":" + '"' + bmsIntegrationIndustries.getEvidence() + '"' + ","+

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsOutQuitProductsServiceImpl.java

@@ -85,6 +85,25 @@ public class BmsOutQuitProductsServiceImpl extends ServiceImpl<BmsOutQuitProduct
         //获取某个在线记录id可以添加到项目库的数据
         JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsOutQuitProductsAddDto.getDeclarationId());
         addProject.setStatus(1);
+
+        if(products.getIndustry() == 1){
+            products.setNewIndustry("轻工");
+        }else if(products.getIndustry() == 2){
+            products.setNewIndustry("纺织");
+        }else if(products.getIndustry() == 3){
+            products.setNewIndustry("冶金");
+        }else if(products.getIndustry() == 4){
+            products.setNewIndustry("化工");
+        }else if(products.getIndustry() == 5){
+            products.setNewIndustry("建材");
+        }else if(products.getIndustry() == 6){
+            products.setNewIndustry("机械加工");
+        }
+        if(products.getType() == 1){
+            products.setNewType("淘汰落后生产工艺装备");
+        }else{
+            products.setNewType("退出低端低效生产工艺装备");
+        }
         addProject.setOtherJson(JSONObject.toJSONString(products));
         addProject.setFileJson( "{" +
                 '"' + "拟淘汰或退出生产工艺装备情况" + '"' + ":" + '"' + products.getSpecifics() + '"' + "," +

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsSceneOpeningAwardServiceImpl.java

@@ -101,6 +101,11 @@ public class BmsSceneOpeningAwardServiceImpl extends ServiceImpl<BmsSceneOpening
         //获取某个在线记录id可以添加到项目库的数据
         JProject addProject = iBmsDeclarationRecordsService.getAddProject(bmsSceneOpeningAwardAddDto.getDeclarationId());
         addProject.setStatus(1);
+        if(bmsSceneOpeningAward.getType() == 0){
+            bmsSceneOpeningAward.setNewType("市场服务类");
+        }else{
+            bmsSceneOpeningAward.setNewType("公共服务类");
+        }
         addProject.setOtherJson(JSONObject.toJSONString(bmsSceneOpeningAward));
         addProject.setFileJson("{" +
                 '"' + "证明材料(公示、发文证明、专家评分表)" + '"' + ":" + '"' + bmsSceneOpeningAward.getMaterial() + '"' +

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * 企业端信息维护（j_enterprise_contact）表控制层
@@ -55,7 +56,11 @@ public class JEnterpriseContactController extends BaseController {
             jEnterpriseContactRequest.setEnterpriseName(str.getNickName());
             jEnterpriseContactRequest.setEnterpriseCode(str.getUserName());
         }
+        if(page.getCurrent() >=1 & page.getSize() >=1){
             return  success(jEnterpriseContactService.page(page, jEnterpriseContactRequest));
+        }else {
+            return  success(jEnterpriseContactService.page(jEnterpriseContactRequest));
+        }
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JEnterpriseContactRequest.java

@@ -25,4 +25,16 @@ public class JEnterpriseContactRequest {
      */
     @ApiModelProperty("统一社会信用代码")
     private String enterpriseCode;
+
+    /**
+     * 常用联系人姓名
+     */
+    @ApiModelProperty("常用联系人姓名")
+    private String contactName;
+
+    /**
+     * 常用联系人职务
+     */
+    @ApiModelProperty("常用联系人职务")
+    private String contactOffice;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JEnterpriseContactMapper.java

@@ -6,6 +6,8 @@ import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
 import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 企业联系人（j_enterprise_contact）表数据层
  * @author du
@@ -13,5 +15,23 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface JEnterpriseContactMapper extends BaseMapper<JEnterpriseContact> {
 
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param page     分页对象
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
     Page<JEnterpriseContact> page(Page<JEnterpriseContact> page,@Param("req") JEnterpriseContactRequest jEnterpriseContactRequest);
+
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
+    List<JEnterpriseContact> page(@Param("req") JEnterpriseContactRequest jEnterpriseContactRequest);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JEnterpriseContactService.java

@@ -7,6 +7,8 @@ import com.ruoyi.jjh.ent.entity.JPolicyFile;
 import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
 import com.ruoyi.jjh.ent.entity.request.JPolicyFileRequest;
 
+import java.util.List;
+
 /**
  * 企业联系人（j_enterprise_contact）表业务层
  * @author du
@@ -22,4 +24,12 @@ public interface JEnterpriseContactService extends IService<JEnterpriseContact>
      * @return 所有数据
      */
     Page<JEnterpriseContact> page(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest);
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
+    List<JEnterpriseContact> page(JEnterpriseContactRequest jEnterpriseContactRequest);
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JEnterpriseContactImpl.java

@@ -8,6 +8,8 @@ import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper;
 import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 企业联系人（j_enterprise_contact）表业务处理层
  * @author du
@@ -27,4 +29,15 @@ public class JEnterpriseContactImpl extends ServiceImpl<JEnterpriseContactMapper
     public Page<JEnterpriseContact> page(Page<JEnterpriseContact> page, JEnterpriseContactRequest jEnterpriseContactRequest) {
         return baseMapper.page(page, jEnterpriseContactRequest);
     }
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param jEnterpriseContactRequest 查询实体
+     * @return 所有数据
+     */
+    @Override
+    public List<JEnterpriseContact> page(JEnterpriseContactRequest jEnterpriseContactRequest) {
+        return  baseMapper.page(jEnterpriseContactRequest);
+    }
 }

ruoyi-admin/src/main/resources/mapper/jjh/ent/JEnterpriseContactMapper.xml

@@ -13,6 +13,12 @@
             <if test="req.enterpriseCode != null and req.enterpriseCode != '' ">
                 and enterprise_code like concat('%',#{req.enterpriseCode},'%')
             </if>
+            <if test="req.contactName != null and req.contactName != '' ">
+                and contact_name like concat('%',#{req.contactName},'%')
+            </if>
+            <if test="req.contactOffice != null and req.contactOffice != '' ">
+                and contact_office like concat('%',#{req.contactOffice},'%')
+            </if>
         </where>
         order by create_time  desc
     </select>

ruoyi-admin/src/main/resources/mapper/jjh/ent/JMemorandumMapper.xml

@@ -23,7 +23,7 @@
         <where>
             type = #{req.type} and project_id = #{req.projectId}
             <if test="req.name != null and req.name != '' ">
-                and name like concat('%',#{req.name},'%') or keywords like concat('%',#{req.name},'%')
+                and (name like concat('%',#{req.name},'%') or keywords like concat('%',#{req.name},'%'))
             </if>
             <if test="req.startTime != null ">
                 and create_time &gt;= #{req.startTime}