Commit 429bdb33 authored by 张宇杰's avatar 张宇杰

修改

parent b6dd9ebb
......@@ -13,10 +13,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......@@ -581,9 +578,16 @@ public class QuestionnaireCtrl {
return questionnaireService.AboutViewListCopy(record);
}
// ,method = RequestMethod.GET
@RequestMapping(value = {"/{realID}"})
@ResponseBody
public Record AboutViewCopyVo(@PathVariable("realID") Integer realID) {
return questionnaireService.AboutViewListCopyVo(realID);
}
@RequestMapping(value = {"/AboutViewCopys"})
@ResponseBody
public Long AboutViewCopys(@RequestBody Questionnaire questionnaire, HttpServletRequest request) {
public Long AboutViewCopys(@PathVariable("realID") Questionnaire questionnaire, HttpServletRequest request) {
Long recordId = this.questionnaireService.selectRecordId(questionnaire.getId(),
request.getSession().getAttribute("realID").toString());
return recordId;
......
......@@ -120,6 +120,8 @@ public interface QuestionnaireDao {
List<Record> AboutViewListCopy(Record record);
Record AboutViewListCopyVo(@Param("realID") Integer realID);
List<SiteCondition> selectSiteConditionListTemp(
@Param("recordId") String recordId,
@Param("qnYear") Integer qnYear,
......
......@@ -5,8 +5,6 @@ import com.tiptimes.model.PerformanceSummary;
import com.tiptimes.model.Record;
import com.tiptimes.model.Review;
import com.tiptimes.model.YearId;
import com.tiptimes.model.exportDTO.SiteCondition;
import org.springframework.data.annotation.Id;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......@@ -137,6 +135,8 @@ public interface QuestionnaireService {
List<Record> AboutViewListCopy(Record record);
Record AboutViewListCopyVo(Integer realID);
void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,
Integer id1, Integer id2, Integer id3,
Integer id9, Integer id10, Integer id11, Integer id12, Integer id13, Integer id14,
......
......@@ -1404,6 +1404,11 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
return questionnaireDao.AboutViewListCopy(record);
}
@Override
public Record AboutViewListCopyVo(Integer realID) {
return questionnaireDao.AboutViewListCopyVo(realID);
}
/**
* 2023年修改导出问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据
*
......
......@@ -1117,6 +1117,10 @@
ORDER BY create_time DESC
</select>
<select id="AboutViewListCopyVo" resultType="com.tiptimes.model.Record">
select * from t_record where create_id =#{realID}
</select>
<!-- 问卷管理-导出基础指标1 众创空间场地情况、是否租赁场地(新)-->
<select id="selectSiteConditionListTemp" resultType="com.tiptimes.model.exportDTO.SiteCondition">
SELECT *
......
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