Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1439
Star 162
Fork 130
S
Skyeye
提交 0492d770 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

问卷调查添加保存正式完成--1.0.1

上级 3ff8831c
展开全部 隐藏空白更改
内联 并排
Showing with 2199 addition and 137 deletion
logs/skyeye.log
浏览文件 @ 0492d770
此差异已折叠。
skyeye-promote/src/main/java/com/skyeye/eve/dao/DwSurveyDirectoryDao.java
浏览文件 @ 0492d770
...@@ -116,4 +116,18 @@ public interface DwSurveyDirectoryDao { ...@@ -116,4 +116,18 @@ public interface DwSurveyDirectoryDao {
public int editQuestionLogicsMationList(List<Map<String, Object>> editquLogics) throws Exception; public int editQuestionLogicsMationList(List<Map<String, Object>> editquLogics) throws Exception;
public int editQuestionScoreMationList(List<Map<String, Object>> editquScore) throws Exception;
public int editQuestionOrderquMationList(List<Map<String, Object>> editquOrderqu) throws Exception;
public int editQuestionRadioMationList(List<Map<String, Object>> editquRadio) throws Exception;
public int editQuestionCheckBoxMationList(List<Map<String, Object>> editquCheckbox) throws Exception;
public int editQuestionMultiFillblankMationList(List<Map<String, Object>> editquMultiFillblank) throws Exception;
public int editQuestionColumnMationList(List<Map<String, Object>> editquColumn) throws Exception;
public int editQuestionRowMationList(List<Map<String, Object>> editquRow) throws Exception;
} }
skyeye-promote/src/main/java/com/skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java
浏览文件 @ 0492d770
...@@ -222,8 +222,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -222,8 +222,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -274,21 +274,30 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -274,21 +274,30 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
JSONArray score = JSONArray.fromObject(map.get("scoreTd").toString());//获取模板绑定信息 JSONArray score = JSONArray.fromObject(map.get("scoreTd").toString());//获取模板绑定信息
if(score.size() > 0){ if(score.size() > 0){
List<Map<String, Object>> quScore = new ArrayList<>(); List<Map<String, Object>> quScore = new ArrayList<>();
List<Map<String, Object>> editquScore = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < score.size(); i++){ for(int i = 0; i < score.size(); i++){
JSONObject object = (JSONObject) score.get(i); JSONObject object = (JSONObject) score.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quScore.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quScore.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquScore.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionScoreMationList(quScore); if(!quScore.isEmpty())
dwSurveyDirectoryDao.addQuestionScoreMationList(quScore);
if(!editquScore.isEmpty())
dwSurveyDirectoryDao.editQuestionScoreMationList(editquScore);
quScore.addAll(editquScore);
map.put("quItems", quScore); map.put("quItems", quScore);
} }
...@@ -306,8 +315,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -306,8 +315,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("geLe", object.getString("geLe")); bean.put("geLe", object.getString("geLe"));
bean.put("scoreNum", object.getString("scoreNum")); bean.put("scoreNum", object.getString("scoreNum"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -358,21 +367,30 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -358,21 +367,30 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
JSONArray orderqu = JSONArray.fromObject(map.get("orderquTd").toString());//获取模板绑定信息 JSONArray orderqu = JSONArray.fromObject(map.get("orderquTd").toString());//获取模板绑定信息
if(orderqu.size() > 0){ if(orderqu.size() > 0){
List<Map<String, Object>> quOrderqu = new ArrayList<>(); List<Map<String, Object>> quOrderqu = new ArrayList<>();
List<Map<String, Object>> editquOrderqu = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < orderqu.size(); i++){ for(int i = 0; i < orderqu.size(); i++){
JSONObject object = (JSONObject) orderqu.get(i); JSONObject object = (JSONObject) orderqu.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quOrderqu.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quOrderqu.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquOrderqu.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionOrderquMationList(quOrderqu); if(!quOrderqu.isEmpty())
dwSurveyDirectoryDao.addQuestionOrderquMationList(quOrderqu);
if(!editquOrderqu.isEmpty())
dwSurveyDirectoryDao.editQuestionOrderquMationList(editquOrderqu);
quOrderqu.addAll(editquOrderqu);
map.put("quItems", quOrderqu); map.put("quItems", quOrderqu);
} }
...@@ -388,8 +406,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -388,8 +406,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -448,8 +466,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -448,8 +466,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -500,24 +518,36 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -500,24 +518,36 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
JSONArray radio = JSONArray.fromObject(map.get("radioTd").toString());//获取模板绑定信息 JSONArray radio = JSONArray.fromObject(map.get("radioTd").toString());//获取模板绑定信息
if(radio.size() > 0){ if(radio.size() > 0){
List<Map<String, Object>> quRadio = new ArrayList<>(); List<Map<String, Object>> quRadio = new ArrayList<>();
List<Map<String, Object>> editquRadio = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < radio.size(); i++){ for(int i = 0; i < radio.size(); i++){
JSONObject object = (JSONObject) radio.get(i); JSONObject object = (JSONObject) radio.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("isNote", object.getString("isNote")); bean.put("isNote", object.getString("isNote"));
bean.put("checkType", CheckType.valueOf(object.get("checkType").toString()).getIndex()); if(!ToolUtil.isNumeric(object.get("checkType").toString()))
bean.put("checkType", CheckType.valueOf(object.get("checkType").toString()).getIndex());
else
bean.put("checkType", object.get("checkType").toString());
bean.put("isRequiredFill", object.getString("isRequiredFill")); bean.put("isRequiredFill", object.getString("isRequiredFill"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quRadio.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quRadio.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquRadio.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionRadioMationList(quRadio); if(!quRadio.isEmpty())
dwSurveyDirectoryDao.addQuestionRadioMationList(quRadio);
if(!editquRadio.isEmpty())
dwSurveyDirectoryDao.editQuestionRadioMationList(editquRadio);
quRadio.addAll(editquRadio);
map.put("quItems", quRadio); map.put("quItems", quRadio);
} }
...@@ -533,8 +563,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -533,8 +563,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -585,24 +615,36 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -585,24 +615,36 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
JSONArray checkbox = JSONArray.fromObject(map.get("checkboxTd").toString());//获取模板绑定信息 JSONArray checkbox = JSONArray.fromObject(map.get("checkboxTd").toString());//获取模板绑定信息
if(checkbox.size() > 0){ if(checkbox.size() > 0){
List<Map<String, Object>> quCheckbox = new ArrayList<>(); List<Map<String, Object>> quCheckbox = new ArrayList<>();
List<Map<String, Object>> editquCheckbox = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < checkbox.size(); i++){ for(int i = 0; i < checkbox.size(); i++){
JSONObject object = (JSONObject) checkbox.get(i); JSONObject object = (JSONObject) checkbox.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("isNote", object.getString("isNote")); bean.put("isNote", object.getString("isNote"));
bean.put("checkType", CheckType.valueOf(object.get("checkType").toString()).getIndex()); if(!ToolUtil.isNumeric(object.get("checkType").toString()))
bean.put("checkType", CheckType.valueOf(object.get("checkType").toString()).getIndex());
else
bean.put("checkType", object.get("checkType").toString());
bean.put("isRequiredFill", object.getString("isRequiredFill")); bean.put("isRequiredFill", object.getString("isRequiredFill"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quCheckbox.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quCheckbox.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquCheckbox.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionCheckBoxMationList(quCheckbox); if(!quCheckbox.isEmpty())
dwSurveyDirectoryDao.addQuestionCheckBoxMationList(quCheckbox);
if(!editquCheckbox.isEmpty())
dwSurveyDirectoryDao.editQuestionCheckBoxMationList(editquCheckbox);
quCheckbox.addAll(editquCheckbox);
map.put("quItems", quCheckbox); map.put("quItems", quCheckbox);
} }
...@@ -618,8 +660,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -618,8 +660,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -670,21 +712,30 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -670,21 +712,30 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
JSONArray multiFillblank = JSONArray.fromObject(map.get("multiFillblankTd").toString());//获取模板绑定信息 JSONArray multiFillblank = JSONArray.fromObject(map.get("multiFillblankTd").toString());//获取模板绑定信息
if(multiFillblank.size() > 0){ if(multiFillblank.size() > 0){
List<Map<String, Object>> quMultiFillblank = new ArrayList<>(); List<Map<String, Object>> quMultiFillblank = new ArrayList<>();
List<Map<String, Object>> editquMultiFillblank = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < multiFillblank.size(); i++){ for(int i = 0; i < multiFillblank.size(); i++){
JSONObject object = (JSONObject) multiFillblank.get(i); JSONObject object = (JSONObject) multiFillblank.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quMultiFillblank.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quMultiFillblank.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquMultiFillblank.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionMultiFillblankMationList(quMultiFillblank); if(!quMultiFillblank.isEmpty())
dwSurveyDirectoryDao.addQuestionMultiFillblankMationList(quMultiFillblank);
if(!editquMultiFillblank.isEmpty())
dwSurveyDirectoryDao.editQuestionMultiFillblankMationList(editquMultiFillblank);
quMultiFillblank.addAll(editquMultiFillblank);
map.put("quItems", quMultiFillblank); map.put("quItems", quMultiFillblank);
} }
...@@ -700,8 +751,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -700,8 +751,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -761,8 +812,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -761,8 +812,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
...@@ -819,42 +870,60 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -819,42 +870,60 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
JSONArray column = JSONArray.fromObject(map.get("column").toString());//获取模板绑定信息 JSONArray column = JSONArray.fromObject(map.get("column").toString());//获取模板绑定信息
if(column.size() > 0){ if(column.size() > 0){
List<Map<String, Object>> quColumn = new ArrayList<>(); List<Map<String, Object>> quColumn = new ArrayList<>();
List<Map<String, Object>> editquColumn = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < column.size(); i++){ for(int i = 0; i < column.size(); i++){
JSONObject object = (JSONObject) column.get(i); JSONObject object = (JSONObject) column.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quColumn.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quColumn.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquColumn.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionColumnMationList(quColumn); if(!quColumn.isEmpty())
dwSurveyDirectoryDao.addQuestionColumnMationList(quColumn);
if(!editquColumn.isEmpty())
dwSurveyDirectoryDao.editQuestionColumnMationList(editquColumn);
quColumn.addAll(editquColumn);
map.put("quColumnItems", quColumn); map.put("quColumnItems", quColumn);
} }
JSONArray row = JSONArray.fromObject(map.get("row").toString());//获取模板绑定信息 JSONArray row = JSONArray.fromObject(map.get("row").toString());//获取模板绑定信息
if(row.size() > 0){ if(row.size() > 0){
List<Map<String, Object>> quRow = new ArrayList<>(); List<Map<String, Object>> quRow = new ArrayList<>();
List<Map<String, Object>> editquRow = new ArrayList<>();
Map<String, Object> user = inputObject.getLogParams(); Map<String, Object> user = inputObject.getLogParams();
for(int i = 0; i < row.size(); i++){ for(int i = 0; i < row.size(); i++){
JSONObject object = (JSONObject) row.get(i); JSONObject object = (JSONObject) row.get(i);
Map<String, Object> bean = new HashMap<>(); Map<String, Object> bean = new HashMap<>();
bean.put("optionId", object.getString("optionId"));
bean.put("orderById", object.getString("key")); bean.put("orderById", object.getString("key"));
bean.put("optionName", object.getString("optionValue")); bean.put("optionName", object.getString("optionValue"));
bean.put("quId", quId); if(ToolUtil.isBlank(object.getString("optionId"))){
bean.put("visibility", 1); bean.put("quId", quId);
bean.put("id", ToolUtil.getSurFaceId()); bean.put("visibility", 1);
bean.put("createId", user.get("id")); bean.put("id", ToolUtil.getSurFaceId());
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createId", user.get("id"));
quRow.add(bean); bean.put("createTime", ToolUtil.getTimeAndToString());
quRow.add(bean);
}else{
bean.put("id", object.getString("optionId"));
editquRow.add(bean);
}
} }
dwSurveyDirectoryDao.addQuestionRowMationList(quRow); if(!quRow.isEmpty())
dwSurveyDirectoryDao.addQuestionRowMationList(quRow);
if(!editquRow.isEmpty())
dwSurveyDirectoryDao.editQuestionRowMationList(editquRow);
quRow.addAll(editquRow);
map.put("quRowItems", quRow); map.put("quRowItems", quRow);
} }
...@@ -870,8 +939,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{ ...@@ -870,8 +939,8 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
bean.put("skQuId", object.getString("skQuId")); bean.put("skQuId", object.getString("skQuId"));
bean.put("logicType", object.getString("logicType")); bean.put("logicType", object.getString("logicType"));
bean.put("title", object.getString("key")); bean.put("title", object.getString("key"));
bean.put("ckQuId", quId);
if(ToolUtil.isBlank(object.getString("quLogicId"))){ if(ToolUtil.isBlank(object.getString("quLogicId"))){
bean.put("ckQuId", quId);
bean.put("visibility", object.getString("visibility")); bean.put("visibility", object.getString("visibility"));
bean.put("createId", user.get("id")); bean.put("createId", user.get("id"));
bean.put("createTime", ToolUtil.getTimeAndToString()); bean.put("createTime", ToolUtil.getTimeAndToString());
......
skyeye-promote/src/main/resources/dbmapper/DwSurveyDirectoryMapper.xml
浏览文件 @ 0492d770
...@@ -344,7 +344,6 @@ ...@@ -344,7 +344,6 @@
<set> <set>
title = #{item.title}, title = #{item.title},
cg_qu_item_id = #{item.cgQuItemId}, cg_qu_item_id = #{item.cgQuItemId},
ck_qu_id = #{item.ckQuId},
ge_le = #{item.geLe}, ge_le = #{item.geLe},
logic_type = #{item.logicType}, logic_type = #{item.logicType},
score_num = #{item.scoreNum}, score_num = #{item.scoreNum},
...@@ -356,69 +355,152 @@ ...@@ -356,69 +355,152 @@
<insert id="addQuestionScoreMationList" parameterType="java.util.Map"> <insert id="addQuestionScoreMationList" parameterType="java.util.Map">
insert into dw_qu_score insert into dw_qu_score
(id, qu_id, option_id, option_name, option_title, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, option_title, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) (#{item.id}, #{item.quId}, #{item.optionName}, #{item.optionTitle}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionScoreMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_score
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<insert id="addQuestionOrderquMationList" parameterType="java.util.Map"> <insert id="addQuestionOrderquMationList" parameterType="java.util.Map">
insert into dw_qu_orderby insert into dw_qu_orderby
(id, qu_id, option_id, option_name, option_title, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, option_title, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) (#{item.id}, #{item.quId}, #{item.optionName}, #{item.optionTitle}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionOrderquMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_orderby
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<insert id="addQuestionRadioMationList" parameterType="java.util.Map"> <insert id="addQuestionRadioMationList" parameterType="java.util.Map">
insert into dw_qu_radio insert into dw_qu_radio
(id, qu_id, option_id, option_name, option_title, check_type, is_note, is_required_fill, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, option_title, check_type, is_note, is_required_fill, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.isNote}, (#{item.id}, #{item.quId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.isNote},
#{item.isRequiredFill}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) #{item.isRequiredFill}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionRadioMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_radio
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
check_type = #{item.checkType},
is_note = #{item.isNote},
is_required_fill = #{item.isRequiredFill},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<insert id="addQuestionCheckBoxMationList" parameterType="java.util.Map"> <insert id="addQuestionCheckBoxMationList" parameterType="java.util.Map">
insert into dw_qu_checkbox insert into dw_qu_checkbox
(id, qu_id, option_id, option_name, option_title, check_type, is_note, is_required_fill, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, option_title, check_type, is_note, is_required_fill, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.isNote}, (#{item.id}, #{item.quId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.isNote},
#{item.isRequiredFill}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) #{item.isRequiredFill}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionCheckBoxMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_checkbox
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
check_type = #{item.checkType},
is_note = #{item.isNote},
is_required_fill = #{item.isRequiredFill},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<insert id="addQuestionMultiFillblankMationList" parameterType="java.util.Map"> <insert id="addQuestionMultiFillblankMationList" parameterType="java.util.Map">
insert into dw_qu_multi_fillblank insert into dw_qu_multi_fillblank
(id, qu_id, option_id, option_name, option_title, check_type, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, option_title, check_type, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) (#{item.id}, #{item.quId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionMultiFillblankMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_multi_fillblank
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<insert id="addQuestionColumnMationList" parameterType="java.util.Map"> <insert id="addQuestionColumnMationList" parameterType="java.util.Map">
insert into dw_qu_chen_column insert into dw_qu_chen_column
(id, qu_id, option_id, option_name, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) (#{item.id}, #{item.quId}, #{item.optionName}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionColumnMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_chen_column
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<insert id="addQuestionRowMationList" parameterType="java.util.Map"> <insert id="addQuestionRowMationList" parameterType="java.util.Map">
insert into dw_qu_chen_row insert into dw_qu_chen_row
(id, qu_id, option_id, option_name, order_by_id, visibility, create_id, create_time) (id, qu_id, option_name, order_by_id, visibility, create_id, create_time)
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime}) (#{item.id}, #{item.quId}, #{item.optionName}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})
</foreach> </foreach>
</insert> </insert>
<update id="editQuestionRowMationList" parameterType="java.util.Map">
<foreach collection="list" item="item" index="index" separator="," >
UPDATE dw_qu_chen_row
<set>
order_by_id = #{item.orderById},
option_name = #{item.optionName},
</set>
WHERE id = #{item.id}
</foreach>
</update>
<select id="queryQuestionMationById" parameterType="java.util.Map" resultType="java.util.Map"> <select id="queryQuestionMationById" parameterType="java.util.Map" resultType="java.util.Map">
SELECT SELECT
a.id, a.id,
......
skyeye-promote/src/main/resources/template/js/dwsurveydesign/dwsurveydesign.js
浏览文件 @ 0492d770
...@@ -1292,7 +1292,7 @@ layui.config({ ...@@ -1292,7 +1292,7 @@ layui.config({
**/ **/
function saveRadio(quItemBody, callback) { function saveRadio(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -1304,15 +1304,8 @@ layui.config({ ...@@ -1304,15 +1304,8 @@ layui.config({
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
contactsAttr: quItemBody.find("input[name='contactsAttr']").val(), contactsAttr: quItemBody.find("input[name='contactsAttr']").val(),
contactsField: quItemBody.find("input[name='contactsField']").val(), contactsField: quItemBody.find("input[name='contactsField']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
var quItemOptions = null; var quItemOptions = null;
if(quItemBody.find("input[name='hv']").val() == 3) { if(quItemBody.find("input[name='hv']").val() == 3) {
//还有是table的情况需要处理 //还有是table的情况需要处理
...@@ -1477,7 +1470,7 @@ layui.config({ ...@@ -1477,7 +1470,7 @@ layui.config({
**/ **/
function saveCheckbox(quItemBody, callback) { function saveCheckbox(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -1489,14 +1482,8 @@ layui.config({ ...@@ -1489,14 +1482,8 @@ layui.config({
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
contactsAttr: quItemBody.find("input[name='contactsAttr']").val(), contactsAttr: quItemBody.find("input[name='contactsAttr']").val(),
contactsField: quItemBody.find("input[name='contactsField']").val(), contactsField: quItemBody.find("input[name='contactsField']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
var quItemOptions = null; var quItemOptions = null;
if(quItemBody.find("input[name='hv']").val() == 3) { if(quItemBody.find("input[name='hv']").val() == 3) {
//还有是table的情况需要处理 //还有是table的情况需要处理
...@@ -1791,7 +1778,7 @@ layui.config({ ...@@ -1791,7 +1778,7 @@ layui.config({
**/ **/
function saveScore(quItemBody, callback) { function saveScore(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -1803,14 +1790,8 @@ layui.config({ ...@@ -1803,14 +1790,8 @@ layui.config({
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
paramInt01: quItemBody.find("input[name='paramInt01']").val(), paramInt01: quItemBody.find("input[name='paramInt01']").val(),
paramInt02: quItemBody.find("input[name='paramInt02']").val(), paramInt02: quItemBody.find("input[name='paramInt02']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
//评分题选项td //评分题选项td
var quItemOptions = quItemBody.find(".quCoItem table.quCoItemTable tr td.quOptionEditTd"); var quItemOptions = quItemBody.find(".quCoItem table.quCoItemTable tr td.quOptionEditTd");
var scoreTd = []; var scoreTd = [];
...@@ -1933,7 +1914,7 @@ layui.config({ ...@@ -1933,7 +1914,7 @@ layui.config({
**/ **/
function saveOrderqu(quItemBody, callback) { function saveOrderqu(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -1943,14 +1924,8 @@ layui.config({ ...@@ -1943,14 +1924,8 @@ layui.config({
hv: quItemBody.find("input[name='hv']").val(), hv: quItemBody.find("input[name='hv']").val(),
randOrder: quItemBody.find("input[name='randOrder']").val(), randOrder: quItemBody.find("input[name='randOrder']").val(),
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
//评分题选项td //评分题选项td
var quItemOptions = quItemBody.find(".quCoItem .quOrderByLeft li.quCoItemUlLi"); var quItemOptions = quItemBody.find(".quCoItem .quOrderByLeft li.quCoItemUlLi");
var orderquTd = []; var orderquTd = [];
...@@ -2083,7 +2058,7 @@ layui.config({ ...@@ -2083,7 +2058,7 @@ layui.config({
**/ **/
function savePagetag(quItemBody, callback) { function savePagetag(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -2145,7 +2120,7 @@ layui.config({ ...@@ -2145,7 +2120,7 @@ layui.config({
**/ **/
function saveParagraph(quItemBody, callback) { function saveParagraph(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -2155,13 +2130,8 @@ layui.config({ ...@@ -2155,13 +2130,8 @@ layui.config({
hv: quItemBody.find("input[name='hv']").val(), hv: quItemBody.find("input[name='hv']").val(),
randOrder: quItemBody.find("input[name='randOrder']").val(), randOrder: quItemBody.find("input[name='randOrder']").val(),
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
//逻辑选项 //逻辑选项
var quLogicItems = quItemBody.find(".quLogicItem"); var quLogicItems = quItemBody.find(".quLogicItem");
var list = []; var list = [];
...@@ -2213,7 +2183,7 @@ layui.config({ ...@@ -2213,7 +2183,7 @@ layui.config({
**/ **/
function saveMultiFillblank(quItemBody, callback) { function saveMultiFillblank(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -2225,13 +2195,8 @@ layui.config({ ...@@ -2225,13 +2195,8 @@ layui.config({
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
paramInt01: quItemBody.find("input[name='paramInt01']").val(), paramInt01: quItemBody.find("input[name='paramInt01']").val(),
paramInt02: quItemBody.find("input[name='paramInt02']").val(), paramInt02: quItemBody.find("input[name='paramInt02']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
//评分题选项td //评分题选项td
var quItemOptions = quItemBody.find(".quCoItem table.mFillblankTable tr td.mFillblankTableEditTd"); var quItemOptions = quItemBody.find(".quCoItem table.mFillblankTable tr td.mFillblankTableEditTd");
var multiFillblankTd = []; var multiFillblankTd = [];
...@@ -2344,7 +2309,7 @@ layui.config({ ...@@ -2344,7 +2309,7 @@ layui.config({
**/ **/
function saveChen(quItemBody, callback) { function saveChen(quItemBody, callback) {
var saveTag = quItemBody.find("input[name='saveTag']").val(); var saveTag = quItemBody.find("input[name='saveTag']").val();
if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) { if(saveTag == 0) {
var data = { var data = {
belongId: parent.rowId, belongId: parent.rowId,
orderById: quItemBody.find("input[name='orderById']").val(), orderById: quItemBody.find("input[name='orderById']").val(),
...@@ -2355,13 +2320,8 @@ layui.config({ ...@@ -2355,13 +2320,8 @@ layui.config({
hv: quItemBody.find("input[name='hv']").val(), hv: quItemBody.find("input[name='hv']").val(),
randOrder: quItemBody.find("input[name='randOrder']").val(), randOrder: quItemBody.find("input[name='randOrder']").val(),
cellCount: quItemBody.find("input[name='cellCount']").val(), cellCount: quItemBody.find("input[name='cellCount']").val(),
quTitle: '', quTitle: encodeURI(quItemBody.find(".quCoTitleEdit").html()),
}; };
var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
if(quTitleSaveTag == 0) {
var quTitle = quItemBody.find(".quCoTitleEdit").html();
data.quTitle = encodeURI(quTitle);
}
//矩阵列选项td //矩阵列选项td
var quColumnOptions = quItemBody.find(".quCoItem table.quCoChenTable tr td.quChenColumnTd"); var quColumnOptions = quItemBody.find(".quCoItem table.quCoChenTable tr td.quChenColumnTd");
var column = []; var column = [];
...@@ -2982,6 +2942,36 @@ layui.config({ ...@@ -2982,6 +2942,36 @@ layui.config({
$(".contactsFieldLi").hide(); $(".contactsFieldLi").hide();
} }
}); });
$("#dwDialogSaveMoreItem").click(function(){
var quItemBody = $(dwDialogObj).parents(".surveyQuItemBody");
var quType = quItemBody.find("input[name='quType']").val();
var areaVal = $("#dwQuMoreTextarea").val();
var areaValSplits = areaVal.split("\n");
$.each(areaValSplits, function(i,item){
item = $.trim(item);
if(item != ""){
if(quType == "RADIO"){
//添加单选选项
addRadioItem(quItemBody, item);
}else if(quType == "CHECKBOX"){
//添加多选选项
addCheckboxItem(quItemBody, item);
}else if(quType == "SCORE"){
addScoreItem(quItemBody, item);
}else if(quType == "ORDERQU"){
addOrderquItem(quItemBody, item);
}else if(quType == "MULTIFILLBLANK"){
addMultiFillblankItem(quItemBody, item);
}else if(quType == "CHENRADIO" || quType == "CHENCHECKBOX" || quType == "CHENFBK" || quType == "CHENSCORE"){
addChenItem(dwDialogObj, quItemBody, item);
}
}
});
$("#dwQuMoreTextarea").val("");
bindQuHoverItem();
dwCommonDialogHide();
});
//选项卡切换 //选项卡切换
$("body").on("click", "#tabType li", function(){ $("body").on("click", "#tabType li", function(){
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或