一些微小bug修改
This commit is contained in:
parent
f1d24da67a
commit
4ede0a5b2d
|
|
@ -61,7 +61,7 @@ public class EpcController extends BaseController {
|
||||||
return service.addEpcTemp(o);
|
return service.addEpcTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("Epc模版新增失败{}",e.getMessage());
|
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);
|
return service.delEpcTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("Epc模版删除失败{}",e.getMessage());
|
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);
|
return service.updateEpcTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("Epc模版修改失败{}",e.getMessage());
|
log.info("Epc模版修改失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("Epc模版修改失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ public class SouthController extends BaseController {
|
||||||
return service.addSouthTemp(o);
|
return service.addSouthTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("南网模版新增失败{}",e.getMessage());
|
log.info("南网模版新增失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("南网模版新增失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -96,7 +96,7 @@ public class SouthController extends BaseController {
|
||||||
return service.delSouthTemp(o);
|
return service.delSouthTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("南网模版删除失败{}",e.getMessage());
|
log.info("南网模版删除失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("南网模版删除失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ public class SouthController extends BaseController {
|
||||||
return service.updateSouthTemp(o);
|
return service.updateSouthTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("南网模版修改失败{}",e.getMessage());
|
log.info("南网模版修改失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("南网模版修改失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ public class StateGridController extends BaseController {
|
||||||
return service.addStateGridTemp(o);
|
return service.addStateGridTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("国网模版新增失败{}",e.getMessage());
|
log.info("国网模版新增失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("国网模版新增失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -79,7 +79,7 @@ public class StateGridController extends BaseController {
|
||||||
return service.getStateGridTempById(o);
|
return service.getStateGridTempById(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("公司业绩管理详情失败{}",e.getMessage());
|
log.info("公司业绩管理详情失败{}",e.getMessage());
|
||||||
return error("公司业绩管理详情失败");
|
return error("公司业绩管理详情失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -96,7 +96,7 @@ public class StateGridController extends BaseController {
|
||||||
return service.delStateGridTemp(o);
|
return service.delStateGridTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("国网模版删除失败{}",e.getMessage());
|
log.info("国网模版删除失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("国网模版删除失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ public class StateGridController extends BaseController {
|
||||||
return service.updateStateGridTemp(o);
|
return service.updateStateGridTemp(o);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
log.info("国网模版修改失败{}",e.getMessage());
|
log.info("国网模版修改失败{}",e.getMessage());
|
||||||
return error(e.getMessage());
|
return error("国网模版修改失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -378,7 +378,6 @@ public class StateGridServiceImpl implements StateGridService {
|
||||||
}
|
}
|
||||||
// 处理分包资质证明材料图片
|
// 处理分包资质证明材料图片
|
||||||
if (item.getSubFileList() != null && !item.getSubFileList().isEmpty()) {
|
if (item.getSubFileList() != null && !item.getSubFileList().isEmpty()) {
|
||||||
int zzIndex = 1;
|
|
||||||
for (TbFileSourceVo file : item.getSubFileList()) {
|
for (TbFileSourceVo file : item.getSubFileList()) {
|
||||||
Map<String, Object> zzMap = new HashMap<>();
|
Map<String, Object> zzMap = new HashMap<>();
|
||||||
zzMap.put("index", idWorker.nextId());
|
zzMap.put("index", idWorker.nextId());
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
LEFT JOIN tb_company_perf tcp ON tcp.id = tcpr.perf_id and tcp.del_flag = 0
|
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
|
WHERE tkp.del_flag = 0 and tcp.id is not null
|
||||||
<if test="personId != '' and personId != null">and tkp.id = #{personId}</if>
|
<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="voltage != '' and voltage != null">and tcp.voltage = #{voltage}</if>
|
||||||
<if test="startTime != null and endTime != null">
|
<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')
|
and tcp.start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d')
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
LEFT JOIN tb_sub_perf tcp ON tcp.id = tcpr.perf_id and tcp.del_flag = 0
|
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
|
WHERE tsp.del_flag = 0 and tcp.id is not null
|
||||||
<if test="personId != '' and personId != null">and tsp.id = #{personId}</if>
|
<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="subId != '' and subId != null">and tcp.sub_id = #{subId}</if>
|
||||||
<if test="voltage != '' and voltage != null">and tcp.voltage = #{voltage}</if>
|
<if test="voltage != '' and voltage != null">and tcp.voltage = #{voltage}</if>
|
||||||
<if test="startTime != null and endTime != null">
|
<if test="startTime != null and endTime != null">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue