‘xugp 1 год назад
Родитель
Сommit
5d1fc60fd3

+ 3 - 1
ims-service/ims-eval/src/main/java/com/ims/eval/entity/PartyBuildingMultiplier.java

@@ -1,5 +1,6 @@
 package com.ims.eval.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,7 +33,7 @@ public class PartyBuildingMultiplier extends Model {
 	/**
 	 * 单位名称
 	 */
-    private String organization_Name;
+    private String organizationName;
 
 
     /**
@@ -43,6 +44,7 @@ public class PartyBuildingMultiplier extends Model {
 	/**
 	 * 板块名称
 	 */
+	@TableField(exist = false)
 	private String sectionName;
 
     /**

+ 9 - 0
ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/PartyBuildingMultiplierServiceImpl.java

@@ -5,13 +5,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
+import com.ims.eval.dao.OrganizationStructureMapper;
+import com.ims.eval.entity.OrganizationStructure;
 import com.ims.eval.entity.PartyBuildingMultiplier;
 import com.ims.eval.dao.PartyBuildingMultiplierMapper;
+import com.ims.eval.service.IOrganizationEvaluationService;
+import com.ims.eval.service.IOrganizationStructureService;
 import com.ims.eval.service.IPartyBuildingMultiplierService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -26,6 +32,9 @@ public class PartyBuildingMultiplierServiceImpl extends ServiceImpl<PartyBuildin
 	@Autowired
 	private PartyBuildingMultiplierMapper partyBuildingMultiplierMapper;
 
+	@Autowired
+	private IOrganizationStructureService iOrganizationStructureService;
+
 	@Override
 	public IPage<PartyBuildingMultiplier> listAll(Integer pageNum,Integer pageSize,String id, String departId, String sectionId, String year) {
 

+ 1 - 1
ims-service/ims-eval/src/main/resources/mappers/PartyBuildingMultiplierMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectAll" resultType="com.ims.eval.entity.PartyBuildingMultiplier">
         SELECT
-            a.id,a.depart_id,a.section_id,b.section_name,a.multiplier,
+            a.id,a.depart_id,a.organization_name,a.section_id,b.section_name,a.multiplier,
                a.remarks,a.year
         FROM
         party_building_multiplier a