Skip to content

M
map-parent
Commit a583bc62 by dupengfei
Options

字典操作 传参方式更改

parent 10a6a199
Showing with 45 additions and 20 deletions
service/zdgl/src/main/java/com/founder/zdgl/controller/DictManageController.java
......@@ -79,11 +79,25 @@ public class DictManageController extends BaseAction {
@Transactional
public Map<String, Object> dictitemEdit(HttpServletRequest request,
@RequestParam(value = "operatetype", defaultValue = "") String operateType,
@RequestParam(value = "JdictItem", defaultValue = "") String JdictItem) {
@RequestParam(value = "groupid", defaultValue = "") String groupid,
@RequestParam(value = "name", defaultValue = "") String name,
@RequestParam(value = "code", defaultValue = "") String code,
@RequestParam(value = "pid", defaultValue = "") String pid,
@RequestParam(value = "description", defaultValue = "") String description
) {
SysUser user = (SysUser) request.getSession().getAttribute("User");
DictItem dictItem = new DictItem();
JSONObject jsonObject = JSONObject.fromObject(JdictItem);
dictItem = (DictItem) JSONObject.toBean(jsonObject, DictItem.class);
dictItem.setCode(code);
dictItem.setName(name);
dictItem.setName(pid);
dictItem.setName(description);
dictItem.setName(groupid);
//JSONObject jsonObject = JSONObject.fromObject(JdictItem);
//dictItem = (DictItem) JSONObject.toBean(jsonObject, DictItem.class);
//如果是更新操作 设置改写人信息
/*if (operateType.equals("update")) {
dictItem.setGxdwdm(user.getUnitcode());
......@@ -98,7 +112,7 @@ public class DictManageController extends BaseAction {
}*/
//logger.warn("=======================operateType==================="+operateType);
String code = "";
String newCode = "";
String message = "1";
Map<String, Object> resultMap = new HashMap<String, Object>();
try {
......@@ -115,27 +129,27 @@ public class DictManageController extends BaseAction {
//map.put("groupid",dictItem.getGroupid());
//如果code为空就生成code
if (dictItem.getCode() == null || dictItem.getCode().equals("")) {
code = dictManageService.getMaxcodeByGroup(dictItem);
if (code != null && !code.endsWith("000")) {
String subcode = code.substring(code.length() - 2);
newCode = dictManageService.getMaxcodeByGroup(dictItem);
if (newCode != null && !newCode.endsWith("000")) {
String subcode = newCode.substring(newCode.length() - 2);
if ((Integer.parseInt(subcode) + 1) < 10) {
subcode = "0" + (Integer.parseInt(subcode) + 1);
} else {
subcode = (Integer.parseInt(subcode) + 1) + "";
}
code = code.substring(0, code.length() - 2) + subcode;
}else if (code != null && code.endsWith("000")){ //第二级 以000结尾 的
String subcode = code.substring(code.length()-5, code.length()-3); //取中间两位
newCode = newCode.substring(0, newCode.length() - 2) + subcode;
}else if (newCode != null && newCode.endsWith("000")){ //第二级 以000结尾 的
String subcode = newCode.substring(newCode.length()-5, newCode.length()-3); //取中间两位
if ((Integer.parseInt(subcode) + 1) < 10) {
subcode = "0" + (Integer.parseInt(subcode) + 1);
} else {
subcode = (Integer.parseInt(subcode) + 1) + "";
}
code = code.substring(0, code.length() - 5) + subcode + code.substring(code.length()-3);
newCode = newCode.substring(0, newCode.length() - 5) + subcode + newCode.substring(newCode.length()-3);
} else {
code = dictItem.getPid() + "01";
newCode = dictItem.getPid() + "01";
}
dictItem.setCode(code);
dictItem.setCode(newCode);
}
dictItem.setIsParent("false");
//线下测试，采用UUID作为主键添加
......@@ -164,7 +178,7 @@ public class DictManageController extends BaseAction {
resultMap.put("message", message);
return resultMap;
}
resultMap.put("message", code);
resultMap.put("message", newCode);
return resultMap;
}
......@@ -852,12 +866,23 @@ public class DictManageController extends BaseAction {
@ResponseBody
public Map<String, Object> xalbJoinGWDQ(@RequestParam(value = "operatetype", defaultValue = "") String operateType,
@RequestParam(value = "xzqhcode", defaultValue = "") String xzqhcode,
@RequestParam(value = "jxalbdmSDJoin", defaultValue = "") String jxalbdmSDJoin,
@RequestParam(value = "mz", defaultValue = "") String mz,
@RequestParam(value = "xzqh", defaultValue = "") String xzqh,
@RequestParam(value = "xalbdmbcms", defaultValue = "") String xalbdmbcms,
@RequestParam(value = "xzc", defaultValue = "") String xzc,
@RequestParam(value = "description", defaultValue = "") String description,
HttpServletRequest request) {
JSONObject jsonObject = JSONObject.fromObject(jxalbdmSDJoin);
XalbdmSDJoin xalbdmSDJoin = (XalbdmSDJoin) JSONObject.toBean(jsonObject, XalbdmSDJoin.class);
SysUser user = (SysUser) request.getSession().getAttribute("User");
//JSONObject jsonObject = JSONObject.fromObject(jxalbdmSDJoin);
//XalbdmSDJoin xalbdmSDJoin = (XalbdmSDJoin) JSONObject.toBean(jsonObject, XalbdmSDJoin.class);
XalbdmSDJoin xalbdmSDJoin = new XalbdmSDJoin();
xalbdmSDJoin.setXzqh(xzqh);
xalbdmSDJoin.setMz(mz);
xalbdmSDJoin.setXalbdmbcms(xalbdmbcms);
xalbdmSDJoin.setXzc(xzc);
xalbdmSDJoin.setDescription(description);
//SysUser user = (SysUser) request.getSession().getAttribute("User");
/*if (operateType.equals("update")) {
xalbdmSDJoin.setGxdwdm(user.getUnitcode());
xalbdmSDJoin.setGxr(user.getUsername());
......@@ -877,7 +902,7 @@ public class DictManageController extends BaseAction {
xalbdmSDJoin.setId(this.getNextId());
xalbdmSDJoin.setGlxzqh(xalbdmSDJoin.getXzqh());
dictManageService.insertXalbdmGWDQJoin(xalbdmSDJoin);
String xzqh = xalbdmSDJoin.getXzqh();
String joinXzqh = xalbdmSDJoin.getXzqh();
message = "";
message += xalbdmSDJoin.getId() + ",";
/* String xzqhcode = operateType = this.getRequest().getParameter("xzqhcode");*/
......@@ -888,7 +913,7 @@ public class DictManageController extends BaseAction {
if (xzqhcodeArray[i] != null) {
if (!xzqhcodeArray[i].equals(xalbdmSDJoin.getXzqh())) {
xalbdmSDJoin.setXzqh(xzqhcodeArray[i]);
xalbdmSDJoin.setGlxzqh(xzqh);
xalbdmSDJoin.setGlxzqh(joinXzqh);
xalbdmSDJoin.setId(this.getNextId());
dictManageService.insertXalbdmGWDQJoin(xalbdmSDJoin);
message += xalbdmSDJoin.getId() + ",";
......
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