|
@ -560,7 +560,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public Boolean delSurveyTemplate(String tempId) {
|
|
public Boolean delSurveyTemplate(String tempId) {
|
|
WlyySurveyTemplateDO temp = surveyTemplateDao.getOne(tempId);
|
|
|
|
|
|
WlyySurveyTemplateDO temp = surveyTemplateDao.findById(tempId).orElse(null);
|
|
if (temp != null) {
|
|
if (temp != null) {
|
|
//删除原有问题
|
|
//删除原有问题
|
|
List<WlyySurveyTemplateQuestionDO> questionDODels = surveyTemplateQuestionDao.findByTemplateCodeAndDelOrderBySortAsc(temp.getId(), "1");
|
|
List<WlyySurveyTemplateQuestionDO> questionDODels = surveyTemplateQuestionDao.findByTemplateCodeAndDelOrderBySortAsc(temp.getId(), "1");
|
|
@ -770,7 +770,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
|
|
*/
|
|
*/
|
|
public WlyySurveyTemplateVO findSurveyTemplateResult(String tempId) {
|
|
public WlyySurveyTemplateVO findSurveyTemplateResult(String tempId) {
|
|
|
|
|
|
WlyySurveyTemplateDO templateDO = surveyTemplateDao.getOne(tempId);
|
|
|
|
|
|
WlyySurveyTemplateDO templateDO = surveyTemplateDao.findById(tempId).orElse(null);
|
|
WlyySurveyTemplateVO templateVO = convertToModel(templateDO, WlyySurveyTemplateVO.class);
|
|
WlyySurveyTemplateVO templateVO = convertToModel(templateDO, WlyySurveyTemplateVO.class);
|
|
templateVO.setLabels(findSurveyTemplateLabel(tempId));
|
|
templateVO.setLabels(findSurveyTemplateLabel(tempId));
|
|
templateVO.setInsplabels(findSurveyInspTemplateLabel(tempId));
|
|
templateVO.setInsplabels(findSurveyInspTemplateLabel(tempId));
|