南网,epc和国网一样,只变类型修改

search-tool/src/main/java/com/bonus/tool/controller/search/EpcController.java

@@ -61,7 +61,7 @@ public class EpcController extends BaseController {
             return service.addEpcTemp(o);
         }catch (Exception e){
             log.info("Epc模版新增失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return  error("Epc模版新增失败");
         }
     }
 
@@ -95,7 +95,7 @@ public class EpcController extends BaseController {
             return service.delEpcTemp(o);
         }catch (Exception e){
             log.info("Epc模版删除失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("Epc模版删除失败");
         }
     }
 
@@ -112,7 +112,7 @@ public class EpcController extends BaseController {
             return service.updateEpcTemp(o);
         }catch (Exception e){
             log.info("Epc模版修改失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("Epc模版修改失败");
         }
     }
 

search-tool/src/main/java/com/bonus/tool/controller/search/SouthController.java

@@ -62,7 +62,7 @@ public class SouthController extends BaseController {
             return service.addSouthTemp(o);
         }catch (Exception e){
             log.info("南网模版新增失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("南网模版新增失败");
         }
     }
 
@@ -96,7 +96,7 @@ public class SouthController extends BaseController {
             return service.delSouthTemp(o);
         }catch (Exception e){
             log.info("南网模版删除失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("南网模版删除失败");
         }
     }
 
@@ -113,7 +113,7 @@ public class SouthController extends BaseController {
             return service.updateSouthTemp(o);
         }catch (Exception e){
             log.info("南网模版修改失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("南网模版修改失败");
         }
     }
 

search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java

@@ -62,7 +62,7 @@ public class StateGridController extends BaseController {
             return service.addStateGridTemp(o);
         }catch (Exception e){
             log.info("国网模版新增失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("国网模版新增失败");
         }
     }
 
@@ -79,7 +79,7 @@ public class StateGridController extends BaseController {
             return service.getStateGridTempById(o);
         }catch (Exception e){
             log.info("公司业绩管理详情失败{}",e.getMessage());
-            return  error("公司业绩管理详情失败");
+            return error("公司业绩管理详情失败");
         }
     }
 
@@ -96,7 +96,7 @@ public class StateGridController extends BaseController {
             return service.delStateGridTemp(o);
         }catch (Exception e){
             log.info("国网模版删除失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return  error("国网模版删除失败");
         }
     }
 
@@ -113,7 +113,7 @@ public class StateGridController extends BaseController {
             return service.updateStateGridTemp(o);
         }catch (Exception e){
             log.info("国网模版修改失败{}",e.getMessage());
-            return  error(e.getMessage());
+            return error("国网模版修改失败");
         }
     }
 
@@ -128,7 +128,7 @@ public class StateGridController extends BaseController {
     @PostMapping("/downloadStateGridTemp")
     public void downloadStateGridTemp(HttpServletRequest request, HttpServletResponse response, @RequestBody TbGwModelDto o) {
         try {
-            service.downloadStateGridTemp(request,  response, o);
+            service.downloadStateGridTemp(request, response, o);
         }catch (Exception e){
             log.info("国网模版下载失败{}",e.getMessage());
         }

search-tool/src/main/java/com/bonus/tool/dto/TbGwModelDto.java

@@ -24,6 +24,12 @@ public class TbGwModelDto implements Serializable {
 	 * 标书名称
 	 */
     private String name;
+
+	/**
+	 * 类型 1.国网  2.EPC 3.南网
+	 */
+	private String type;
+
 	/**
 	 * 创建时间
 	 */

search-tool/src/main/java/com/bonus/tool/dto/TbGwModelVo.java

@@ -24,6 +24,12 @@ public class TbGwModelVo implements Serializable {
 	 * 标书名称
 	 */
     private String name;
+
+	/**
+	 * 类型 1.国网  2.EPC 3.南网
+	 */
+	private String type;
+
 	/**
 	 * 创建时间
 	 */

search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java

@@ -378,7 +378,6 @@ public class StateGridServiceImpl implements StateGridService {
                     }
                     // 处理分包资质证明材料图片
                     if (item.getSubFileList() != null && !item.getSubFileList().isEmpty()) {
-                        int zzIndex = 1;
                         for (TbFileSourceVo file : item.getSubFileList()) {
                             Map<String, Object> zzMap = new HashMap<>();
                             zzMap.put("index", idWorker.nextId());

search-tool/src/main/resources/mapper/StateGridMapper.xml

@@ -4,10 +4,8 @@
 <mapper namespace="com.bonus.tool.mapper.StateGridMapper">
 
     <insert id="addStateGridTemp" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into tb_gw_model(name,
-                                create_user)
-        values (#{name},
-                #{createUser})
+        insert into tb_gw_model(name,create_user,type)
+        values (#{name},#{createUser},#{type})
     </insert>
     <insert id="insertComPerf">
         insert into tb_gw_perf_rel(
@@ -145,7 +143,9 @@
         create_time,
         update_time
         from
-        tb_gw_model where del_flag =0
+        tb_gw_model
+        where del_flag = 0
+        and type = #{type}
         <if test="name != '' and name != null">
             and locate(#{name},name)
         </if>

search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml

@@ -97,7 +97,7 @@
         LEFT JOIN tb_company_perf tcp ON tcp.id = tcpr.perf_id and tcp.del_flag = 0
         WHERE tkp.del_flag = 0 and tcp.id is not null
         <if test="personId != '' and personId != null">and tkp.id = #{personId}</if>
-        <if test="proName != '' and proName != null">and tcp.pro_name = #{proName}</if>
+        <if test="proName != '' and proName != null">and locate(#{proName},tcp.pro_name)</if>
         <if test="voltage != '' and voltage != null">and tcp.voltage = #{voltage}</if>
         <if test="startTime != null and endTime != null">
             and tcp.start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND  STR_TO_DATE(#{endTime}, '%Y-%m-%d')

search-tool/src/main/resources/mapper/TbSubPerfMapper.xml

@@ -85,7 +85,7 @@
 		LEFT JOIN tb_sub_perf tcp ON tcp.id = tcpr.perf_id and tcp.del_flag = 0
 		WHERE tsp.del_flag = 0 and tcp.id is not null
 		<if test="personId != '' and personId != null">and tsp.id = #{personId}</if>
-		<if test="proName != '' and proName != null">and  tcp.pro_name = #{proName}</if>
+		<if test="proName != '' and proName != null">and locate(#{proName},tcp.pro_name)</if>
 		<if test="subId != '' and subId != null">and  tcp.sub_id = #{subId}</if>
 		<if test="voltage != '' and voltage != null">and  tcp.voltage = #{voltage}</if>
 		<if test="startTime != null and endTime != null">