Commit 776bddeb authored by tangwei's avatar tangwei

修改bug

parent 251780d2
...@@ -115,7 +115,7 @@ public class EXPersonUser { ...@@ -115,7 +115,7 @@ public class EXPersonUser {
@ExcelProperty(value = "是否特殊工种", index = 21) @ExcelProperty(value = "是否特殊工种", index = 21)
@ExplicitConstraint(indexNum = 21, source = {"是","否"}) //固定下拉内容 @ExplicitConstraint(indexNum = 21, source = {"是","否"}) //固定下拉内容
@ApiModelProperty(value = "是否特殊工种") @ApiModelProperty(value = "是否特殊工种")
private Integer isSpecialWork; private String isSpecialWork;
@ExcelProperty(value = "技能鉴定工种", index = 22) @ExcelProperty(value = "技能鉴定工种", index = 22)
@ExplicitConstraint(indexNum = 22, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容 @ExplicitConstraint(indexNum = 22, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</where> </where>
</select> </select>
<delete id="deleteList" parameterType="int"> <delete id="deleteList">
delete from station_basic where sequence_nbr = #{id}; delete from station_basic where sequence_nbr = #{id};
delete from station_coordinate where station_id = #{id} delete from station_coordinate where station_id = #{id}
</delete> </delete>
......
...@@ -140,17 +140,5 @@ public class PrivilegeController extends BaseController{ ...@@ -140,17 +140,5 @@ public class PrivilegeController extends BaseController{
} }
// public List<ListCompanyModel> getdata(Collection<CompanyModel> datas){
// List<ListCompanyModel> list =new ArrayList<>();
// for (CompanyModel companyModel : datas) {
// ListCompanyModel companyModeld = new ListCompanyModel();
// companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
// companyModeld.setCompanyName(companyModel.getCompanyName());
// companyModeld.setChildren(getdata(companyModel.getChildren()));
// list.add(companyModeld);
// }
// return list;
// }
} }
...@@ -53,7 +53,7 @@ public class StationBasicController extends BaseController { ...@@ -53,7 +53,7 @@ public class StationBasicController extends BaseController {
stationBasicServiceImpl.add(model); stationBasicServiceImpl.add(model);
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
} catch (InnerInvokException e) { } catch (InnerInvokException e) {
return this.buildResponseFalse(e.getMessage()); return this.buildResponseFalse(e.getMessage().replace("公司","场站"));
} }
} }
...@@ -84,7 +84,7 @@ public class StationBasicController extends BaseController { ...@@ -84,7 +84,7 @@ public class StationBasicController extends BaseController {
stationBasicServiceImpl.update(model); stationBasicServiceImpl.update(model);
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
} catch (InnerInvokException e) { } catch (InnerInvokException e) {
return this.buildResponseFalse(e.getMessage()); return this.buildResponseFalse(e.getMessage().replace("公司","场站"));
} }
} }
......
...@@ -197,7 +197,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station ...@@ -197,7 +197,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
@Transactional
public void update(StationBasic stationBasic) { public void update(StationBasic stationBasic) {
//场站坐标信息 //场站坐标信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment