tchao 3 år sedan
förälder
incheckning
9f1fe96a80
100 ändrade filer med 738 tillägg och 0 borttagningar
  1. BIN
      web/WEB-INF/classes/com/baidu/yun/push/auth/PushKeyPair.class
  2. BIN
      web/WEB-INF/classes/com/baidu/yun/push/auth/signature/PushSignatureDigest.class
  3. BIN
      web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPush.class
  4. BIN
      web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPushAsync.class
  5. BIN
      web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPushAsyncClient.class
  6. BIN
      web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPushClient.class
  7. BIN
      web/WEB-INF/classes/com/baidu/yun/push/exception/PushClientException.class
  8. BIN
      web/WEB-INF/classes/com/baidu/yun/push/exception/PushServerException.class
  9. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/AddDevicesToTagRequest.class
  10. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/AddDevicesToTagResponse.class
  11. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/BindInfo.class
  12. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/CreateTagRequest.class
  13. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/CreateTagResponse.class
  14. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/DeleteDevicesFromTagRequest.class
  15. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/DeleteDevicesFromTagResponse.class
  16. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/DeleteTagRequest.class
  17. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/DeviceStatUnit.class
  18. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForAck.class
  19. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForDevice.class
  20. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForMsg.class
  21. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForTopic.class
  22. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/MsgSendInfo.class
  23. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushBatchUniMsgRequest.class
  24. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushBatchUniMsgResponse.class
  25. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToAllResponse.class
  26. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSingleDeviceRequest.class
  27. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSingleDeviceResponse.class
  28. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSmartTagRequest.class
  29. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSmartTagResponse.class
  30. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToTagRequest.class
  31. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToTagResponse.class
  32. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushRequest.class
  33. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/PushResponse.class
  34. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryDeviceNumInTagRequest.class
  35. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryDeviceNumInTagResponse.class
  36. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryMsgStatusRequest.class
  37. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryMsgStatusResponse.class
  38. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticDeviceRequest.class
  39. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticDeviceResponse.class
  40. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticMsgRequest.class
  41. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticMsgResponse.class
  42. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticTopicRequest.class
  43. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticTopicResponse.class
  44. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTagsRequest.class
  45. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTagsResponse.class
  46. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTimerListRequest.class
  47. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTimerListResponse.class
  48. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTimerRecordsResponse.class
  49. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicListRequest.class
  50. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicListResponse.class
  51. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicRecordsRequest.class
  52. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicRecordsResponse.class
  53. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/Record.class
  54. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/TagInfo.class
  55. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/TopicResultInfo.class
  56. BIN
      web/WEB-INF/classes/com/baidu/yun/push/model/TopicStatUnit.class
  57. BIN
      web/WEB-INF/classes/com/baidu/yun/push/transform/PushRestRequestChecker.class
  58. BIN
      web/WEB-INF/classes/com/baidu/yun/push/transform/PushRestRequestMapper.class
  59. BIN
      web/WEB-INF/classes/com/baidu/yun/push/transform/PushRestResponseJsonUnmapper.class
  60. BIN
      web/WEB-INF/classes/com/baidu/yun/push/transform/utils/TransformUtilitiy.class
  61. BIN
      web/WEB-INF/classes/com/haiya/produce/atsimpl/AtsCalculateOt.class
  62. BIN
      web/WEB-INF/classes/com/haiya/produce/atsimpl/AtsCalculateTrip.class
  63. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/HyBudgetController$1.class
  64. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/HyBudgetController$2.class
  65. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/HyBudgetController.class
  66. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/HyVoteController.class
  67. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/HyVotePrivilegeController.class
  68. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/HyVoteResultController.class
  69. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/SysAnswerController.class
  70. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/oa/SysQuestionnaireController.class
  71. BIN
      web/WEB-INF/classes/com/haiya/produce/controller/report/HyReprotController.class
  72. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/HyVoteDao.class
  73. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/HyVotePrivilegeDao.class
  74. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/HyVoteResultDao.class
  75. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/SysAnswerDao.class
  76. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/SysAnswerDetailDao.class
  77. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/SysQuestionDao.class
  78. BIN
      web/WEB-INF/classes/com/haiya/produce/dao/oa/SysQuestionOptDao.class
  79. BIN
      web/WEB-INF/classes/com/haiya/produce/job/EmployeeTurnoverJob.class
  80. 141 0
      web/WEB-INF/classes/com/haiya/produce/maper/HyVote.map.xml
  81. 83 0
      web/WEB-INF/classes/com/haiya/produce/maper/HyVoteObj.map.xml
  82. 83 0
      web/WEB-INF/classes/com/haiya/produce/maper/HyVotePrivilege.map.xml
  83. 79 0
      web/WEB-INF/classes/com/haiya/produce/maper/HyVoteResult.map.xml
  84. 120 0
      web/WEB-INF/classes/com/haiya/produce/maper/SysAnswer.map.xml
  85. 48 0
      web/WEB-INF/classes/com/haiya/produce/maper/SysQuestion.map.xml
  86. 45 0
      web/WEB-INF/classes/com/haiya/produce/maper/SysQuestionOpt.map.xml
  87. 139 0
      web/WEB-INF/classes/com/haiya/produce/maper/SysQuestionnaire.map.xml
  88. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/HyVote.class
  89. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/HyVoteObj.class
  90. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/HyVotePrivilege.class
  91. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/HyVoteResult.class
  92. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/SysAnswer.class
  93. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/SysAnswerDetail.class
  94. BIN
      web/WEB-INF/classes/com/haiya/produce/model/oa/SysQuestionnaire.class
  95. BIN
      web/WEB-INF/classes/com/haiya/produce/script/HaiyaScript.class
  96. BIN
      web/WEB-INF/classes/com/haiya/produce/service/oa/HyBudgetService.class
  97. BIN
      web/WEB-INF/classes/com/haiya/produce/service/oa/HyVoteResultService.class
  98. BIN
      web/WEB-INF/classes/com/haiya/produce/service/oa/HyVoteService.class
  99. BIN
      web/WEB-INF/classes/com/haiya/produce/servlet/KaoQinServlet.class
  100. 0 0
      web/WEB-INF/classes/com/hotent/Test.class

BIN
web/WEB-INF/classes/com/baidu/yun/push/auth/PushKeyPair.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/auth/signature/PushSignatureDigest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPush.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPushAsync.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPushAsyncClient.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/client/BaiduPushClient.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/exception/PushClientException.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/exception/PushServerException.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/AddDevicesToTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/AddDevicesToTagResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/BindInfo.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/CreateTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/CreateTagResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/DeleteDevicesFromTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/DeleteDevicesFromTagResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/DeleteTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/DeviceStatUnit.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForAck.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForDevice.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForMsg.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/KeyValueForTopic.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/MsgSendInfo.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushBatchUniMsgRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushBatchUniMsgResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToAllResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSingleDeviceRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSingleDeviceResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSmartTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToSmartTagResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushMsgToTagResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/PushResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryDeviceNumInTagRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryDeviceNumInTagResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryMsgStatusRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryMsgStatusResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticDeviceRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticDeviceResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticMsgRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticMsgResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticTopicRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryStatisticTopicResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTagsRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTagsResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTimerListRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTimerListResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTimerRecordsResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicListRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicListResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicRecordsRequest.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/QueryTopicRecordsResponse.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/Record.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/TagInfo.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/TopicResultInfo.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/model/TopicStatUnit.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/transform/PushRestRequestChecker.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/transform/PushRestRequestMapper.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/transform/PushRestResponseJsonUnmapper.class


BIN
web/WEB-INF/classes/com/baidu/yun/push/transform/utils/TransformUtilitiy.class


BIN
web/WEB-INF/classes/com/haiya/produce/atsimpl/AtsCalculateOt.class


BIN
web/WEB-INF/classes/com/haiya/produce/atsimpl/AtsCalculateTrip.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/HyBudgetController$1.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/HyBudgetController$2.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/HyBudgetController.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/HyVoteController.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/HyVotePrivilegeController.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/HyVoteResultController.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/SysAnswerController.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/oa/SysQuestionnaireController.class


BIN
web/WEB-INF/classes/com/haiya/produce/controller/report/HyReprotController.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/HyVoteDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/HyVotePrivilegeDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/HyVoteResultDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/SysAnswerDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/SysAnswerDetailDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/SysQuestionDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/dao/oa/SysQuestionOptDao.class


BIN
web/WEB-INF/classes/com/haiya/produce/job/EmployeeTurnoverJob.class


+ 141 - 0
web/WEB-INF/classes/com/haiya/produce/maper/HyVote.map.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.HyVote">
+	<resultMap id="HyVote" type="com.haiya.produce.model.oa.HyVote">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="title" column="TITLE" jdbcType="VARCHAR"/>
+		<result property="content" column="CONTENT" jdbcType="VARCHAR"/>
+		<result property="isRequired" column="IS_REQUIRED" jdbcType="NUMERIC"/>
+		<result property="isOpen" column="IS_OPEN" jdbcType="NUMERIC"/>
+		<result property="num" column="NUM" jdbcType="NUMERIC"/>
+		<result property="expireDate" column="EXPIRE_DATE" jdbcType="DATE"/>
+		<result property="status" column="STATUS" jdbcType="NUMERIC"/>
+		<result property="score" column="SCORE" jdbcType="NUMERIC"/>
+		<result property="creatorId" column="CREATOR_ID" jdbcType="NUMERIC"/>
+		<result property="creatorOrgId" column="CREATOR_ORG_ID" jdbcType="NUMERIC"/>
+		<result property="createTime" column="CREATE_TIME" jdbcType="DATE"/>
+	</resultMap>
+	
+	
+
+	<sql id="columns">
+		ID,TITLE,CONTENT,IS_REQUIRED,IS_OPEN,NUM,EXPIRE_DATE,STATUS,SCORE,CREATOR_ID,CREATOR_ORG_ID,CREATE_TIME
+	</sql>
+	
+	
+	<sql id="dynamicWhere">
+		<if test="@Ognl@isNotEmpty(title)"> AND TITLE  LIKE #{title}  </if>
+		<if test="@Ognl@isNotEmpty(content)"> AND CONTENT  LIKE #{content}  </if>
+		<if test="@Ognl@isNotEmpty(isRequired)"> AND IS_REQUIRED  =#{isRequired} </if>
+		<if test="@Ognl@isNotEmpty(isOpen)"> AND IS_OPEN  =#{isOpen} </if>
+		<if test="@Ognl@isNotEmpty(num)"> AND NUM  =#{num} </if>
+		<if test="@Ognl@isNotEmpty(expireDate)"> AND EXPIRE_DATE  =#{expireDate} </if>
+		<if test="@Ognl@isNotEmpty(beginexpireDate)"> AND EXPIRE_DATE  >=#{beginexpireDate,jdbcType=DATE} </if>
+		<if test="@Ognl@isNotEmpty(endexpireDate)"> AND EXPIRE_DATE <![CDATA[ <=#{endexpireDate,jdbcType=DATE}]]> </if>
+		<if test="@Ognl@isNotEmpty(status)"> AND STATUS  =#{status} </if>
+		<if test="@Ognl@isNotEmpty(score)"> AND SCORE  =#{score} </if>
+		<if test="@Ognl@isNotEmpty(creatorId)"> AND CREATOR_ID  =#{creatorId} </if>
+		<if test="@Ognl@isNotEmpty(creatorOrgId)"> AND CREATOR_ORG_ID  =#{creatorOrgId} </if>
+		<if test="@Ognl@isNotEmpty(createTime)"> AND CREATE_TIME  =#{createTime} </if>
+		<if test="@Ognl@isNotEmpty(begincreateTime)"> AND CREATE_TIME  >=#{begincreateTime,jdbcType=DATE} </if>
+		<if test="@Ognl@isNotEmpty(endcreateTime)"> AND CREATE_TIME <![CDATA[ <=#{endcreateTime,jdbcType=DATE}]]> </if>
+	</sql>
+
+	<insert id="add" parameterType="com.haiya.produce.model.oa.HyVote">
+		INSERT INTO HY_VOTE
+		(ID,TITLE,CONTENT,IS_REQUIRED,IS_OPEN,NUM,EXPIRE_DATE,STATUS,SCORE,CREATOR_ID,CREATOR_ORG_ID,CREATE_TIME)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{isRequired,jdbcType=NUMERIC}, #{isOpen,jdbcType=NUMERIC}, #{num,jdbcType=NUMERIC}, #{expireDate,jdbcType=DATE}, #{status,jdbcType=NUMERIC}, #{score,jdbcType=NUMERIC}, #{creatorId,jdbcType=NUMERIC}, #{creatorOrgId,jdbcType=NUMERIC}, #{createTime,jdbcType=DATE})
+	</insert>
+	
+	<delete id="delById" parameterType="java.lang.Long">
+		DELETE FROM HY_VOTE 
+		WHERE
+		ID=#{id}
+	</delete>
+	
+	<update id="update" parameterType="com.haiya.produce.model.oa.HyVote">
+		UPDATE HY_VOTE SET
+		TITLE=#{title,jdbcType=VARCHAR},
+		CONTENT=#{content,jdbcType=VARCHAR},
+		IS_REQUIRED=#{isRequired,jdbcType=NUMERIC},
+		IS_OPEN=#{isOpen,jdbcType=NUMERIC},
+		NUM=#{num,jdbcType=NUMERIC},
+		EXPIRE_DATE=#{expireDate,jdbcType=DATE},
+		STATUS=#{status,jdbcType=NUMERIC},
+		SCORE=#{score,jdbcType=NUMERIC}
+		WHERE
+		ID=#{id}
+	</update>
+		    
+	<select id="getById" parameterType="java.lang.Long" resultMap="HyVote">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE
+		WHERE
+		ID=#{id}
+	</select>
+	
+	<select id="getAll" resultMap="HyVote">
+		SELECT 
+			A.ID,A.TITLE,A.CONTENT,A.IS_REQUIRED,A.IS_OPEN,A.NUM,A.EXPIRE_DATE,A.STATUS,A.SCORE,A.CREATOR_ID,A.CREATOR_ORG_ID,A.CREATE_TIME,
+			B.FULLNAME AS CREATOR
+		FROM HY_VOTE A 
+		LEFT JOIN SYS_USER B ON A.CREATOR_ID = B.USERID
+		<where>
+			<include refid="dynamicWhere" />
+		</where>
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+		
+		<if test="@Ognl@isEmpty(orderField)">
+		order by A.ID  desc
+		</if>
+	</select>
+
+	<select id="getAllForColumn" resultMap="HyVote">
+		SELECT ID,TITLE,CONTENT,IS_REQUIRED,IS_OPEN,NUM,EXPIRE_DATE,STATUS,SCORE,CREATOR_ID,CREATOR_ORG_ID,CREATE_TIME,
+		(SELECT COUNT(1) FROM HY_VOTE_RESULT B WHERE A.ID = B.HY_VOTE_ID AND B.USER_ID = #{userId}) as votedNum
+		FROM HY_VOTE A WHERE A.ID IN (
+			select t.OBJECT_ID from (
+				<foreach collection="relationMap" index="key"  item="ent" separator="union">
+					select rig.OBJECT_ID from sys_obj_rights rig where rig.RIGHT_TYPE=#{key} and rig.OBJ_TYPE=#{objType} 
+					<if test="@Ognl@notEquals(key,'all') and @Ognl@isNotEmpty(ent)">
+							and rig.OWNER_ID in 
+							<foreach collection="ent"  item="id" separator="," open="(" close=")">
+								#{id}
+							</foreach>
+					</if>
+				</foreach>
+			) t 
+		) AND A.STATUS = 1
+		<if test="@Ognl@isNotEmpty(title)"> AND A.TITLE  LIKE #{title}  </if>
+		<if test="@Ognl@isNotEmpty(orderField)">
+			order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+			order by A.CREATE_TIME  desc
+		</if>
+	</select>
+
+	<select id="getMyVoteCount" resultType="java.lang.Integer">
+		SELECT count(1)
+			FROM HY_VOTE A WHERE ID IN (
+				select t.OBJECT_ID from (
+					<foreach collection="relationMap" index="key"  item="ent" separator="union">
+						select rig.OBJECT_ID from sys_obj_rights rig where rig.RIGHT_TYPE=#{key} and rig.OBJ_TYPE=#{objType} 
+						<if test="@Ognl@notEquals(key,'all') and @Ognl@isNotEmpty(ent)">
+								and rig.OWNER_ID in 
+								<foreach collection="ent"  item="id" separator="," open="(" close=")">
+									#{id}
+								</foreach>
+						</if>
+					</foreach>
+				) t 
+			) AND  NOT EXISTS(
+	      		SELECT 1 FROM HY_VOTE_RESULT B WHERE A.ID = B.HY_VOTE_ID AND B.USER_ID = #{userId}
+			) AND A.STATUS = 1
+	</select>
+	
+	
+</mapper>

+ 83 - 0
web/WEB-INF/classes/com/haiya/produce/maper/HyVoteObj.map.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.HyVoteObj">
+	<resultMap id="HyVoteObj" type="com.haiya.produce.model.oa.HyVoteObj">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="hyVoteId" column="HY_VOTE_ID" jdbcType="NUMERIC"/>
+		<result property="title" column="TITLE" jdbcType="VARCHAR"/>
+		<result property="content" column="CONTENT" jdbcType="VARCHAR"/>
+		<result property="pic" column="PIC" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+	
+
+	<sql id="columns">
+		ID,HY_VOTE_ID,TITLE,CONTENT,PIC
+	</sql>
+	
+	
+	<sql id="dynamicWhere">
+		<where>
+			<if test="@Ognl@isNotEmpty(id)"> AND ID  =#{id} </if>
+			<if test="@Ognl@isNotEmpty(hyVoteId)"> AND HY_VOTE_ID  =#{hyVoteId} </if>
+			<if test="@Ognl@isNotEmpty(title)"> AND TITLE  LIKE #{title}  </if>
+			<if test="@Ognl@isNotEmpty(content)"> AND CONTENT  LIKE #{content}  </if>
+			<if test="@Ognl@isNotEmpty(pic)"> AND PIC  LIKE #{pic}  </if>
+		</where>
+	</sql>
+
+	<insert id="add" parameterType="com.haiya.produce.model.oa.HyVoteObj">
+		INSERT INTO HY_VOTE_OBJ
+		(ID,HY_VOTE_ID,TITLE,CONTENT,PIC)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{hyVoteId,jdbcType=NUMERIC}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR})
+	</insert>
+	
+	<delete id="delById" parameterType="java.lang.Long">
+		DELETE FROM HY_VOTE_OBJ 
+		WHERE
+		ID=#{id}
+	</delete>
+	
+	<update id="update" parameterType="com.haiya.produce.model.oa.HyVoteObj">
+		UPDATE HY_VOTE_OBJ SET
+		HY_VOTE_ID=#{hyVoteId,jdbcType=NUMERIC},
+		TITLE=#{title,jdbcType=VARCHAR},
+		CONTENT=#{content,jdbcType=VARCHAR},
+		PIC=#{pic,jdbcType=VARCHAR}
+		WHERE
+		ID=#{id}
+	</update>
+	<delete id="delByMainId">
+	    DELETE FROM HY_VOTE_OBJ
+	    WHERE
+	    HY_VOTE_ID=#{hyVoteId}
+	</delete>    
+	
+	<select id="getHyVoteObjList" resultMap="HyVoteObj">
+	    SELECT <include refid="columns"/>
+	    FROM HY_VOTE_OBJ 
+	    WHERE HY_VOTE_ID=#{hyVoteId}
+	</select>
+		    
+	<select id="getById" parameterType="java.lang.Long" resultMap="HyVoteObj">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE_OBJ
+		WHERE
+		ID=#{id}
+	</select>
+	
+	<select id="getAll" resultMap="HyVoteObj">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE_OBJ   
+		<include refid="dynamicWhere" />
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+		order by ID  desc
+		</if>
+	</select>
+	
+	
+</mapper>

+ 83 - 0
web/WEB-INF/classes/com/haiya/produce/maper/HyVotePrivilege.map.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.HyVotePrivilege">
+	<resultMap id="HyVotePrivilege" type="com.haiya.produce.model.oa.HyVotePrivilege">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="score" column="SCORE" jdbcType="NUMERIC"/>
+		<result property="num" column="NUM" jdbcType="NUMERIC"/>
+	</resultMap>
+	
+	<sql id="columns">
+		ID,SCORE,NUM
+	</sql>
+	
+	
+	<sql id="dynamicWhere">
+		<where>
+			<if test="@Ognl@isNotEmpty(id)"> AND ID  =#{id} </if>
+			<if test="@Ognl@isNotEmpty(score)"> AND SCORE  =#{score} </if>
+			<if test="@Ognl@isNotEmpty(num)"> AND NUM  =#{num} </if>
+		</where>
+	</sql>
+
+	<insert id="add" parameterType="com.haiya.produce.model.oa.HyVotePrivilege">
+		INSERT INTO HY_VOTE_PRIVILEGE
+		(ID,SCORE,NUM)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{score,jdbcType=NUMERIC}, #{num,jdbcType=NUMERIC} )
+	</insert>
+	
+	<delete id="delById" parameterType="java.lang.Long">
+		DELETE FROM HY_VOTE_PRIVILEGE 
+		WHERE
+		ID=#{id}
+	</delete>
+	
+	<update id="update" parameterType="com.haiya.produce.model.oa.HyVotePrivilege">
+		UPDATE HY_VOTE_PRIVILEGE SET
+		SCORE=#{score,jdbcType=NUMERIC},
+		NUM=#{num,jdbcType=NUMERIC}
+		WHERE
+		ID=#{id}
+	</update>
+		    
+	<select id="getById" parameterType="java.lang.Long" resultMap="HyVotePrivilege">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE_PRIVILEGE
+		WHERE
+		ID=#{id}
+	</select>
+	
+	<select id="getAll" resultMap="HyVotePrivilege">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE_PRIVILEGE   
+		<include refid="dynamicWhere" />
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+		order by ID  desc
+		</if>
+	</select>
+	
+	<select id="getAllForRight" resultMap="HyVotePrivilege">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE_PRIVILEGE WHERE ID IN (
+			select t.OBJECT_ID from (
+				<foreach collection="relationMap" index="key"  item="ent" separator="union">
+					select rig.OBJECT_ID from sys_obj_rights rig where rig.RIGHT_TYPE=#{key} and rig.OBJ_TYPE=#{objType} 
+					<if test="@Ognl@notEquals(key,'all') and @Ognl@isNotEmpty(ent)">
+							and rig.OWNER_ID in 
+							<foreach collection="ent"  item="id" separator="," open="(" close=")">
+								#{id}
+							</foreach>
+					</if>
+				</foreach>
+			) t 
+		)  
+		order by ID  desc
+	</select>
+	
+	
+	
+</mapper>

+ 79 - 0
web/WEB-INF/classes/com/haiya/produce/maper/HyVoteResult.map.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.HyVoteResult">
+	<resultMap id="HyVoteResult" type="com.haiya.produce.model.oa.HyVoteResult">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="hyVoteId" column="HY_VOTE_ID" jdbcType="NUMERIC"/>
+		<result property="hyVoteObjId" column="HY_VOTE_OBJ_ID" jdbcType="NUMERIC"/>
+		<result property="score" column="SCORE" jdbcType="NUMERIC"/>
+		<result property="userId" column="USER_ID" jdbcType="NUMERIC"/>
+		<result property="orgId" column="ORG_ID" jdbcType="NUMERIC"/>
+		<result property="voteTime" column="VOTE_TIME" jdbcType="DATE"/>
+	</resultMap>
+
+	<sql id="columns">
+		ID,HY_VOTE_ID,HY_VOTE_OBJ_ID,SCORE,USER_ID,ORG_ID,VOTE_TIME
+	</sql>
+	
+	
+	<sql id="dynamicWhere">
+		<where>
+			<if test="@Ognl@isNotEmpty(voteTime)"> AND VOTE_TIME  =#{voteTime} </if>
+			<if test="@Ognl@isNotEmpty(beginvoteTime)"> AND VOTE_TIME  >=#{beginvoteTime,jdbcType=DATE} </if>
+			<if test="@Ognl@isNotEmpty(endvoteTime)"> AND VOTE_TIME <![CDATA[ <=#{endvoteTime,jdbcType=DATE}]]> </if>
+		</where>
+	</sql>
+
+	<insert id="add" parameterType="com.haiya.produce.model.oa.HyVoteResult">
+		INSERT INTO HY_VOTE_RESULT
+		(ID,HY_VOTE_ID,HY_VOTE_OBJ_ID,SCORE,USER_ID,ORG_ID,VOTE_TIME)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{hyVoteId,jdbcType=NUMERIC}, #{hyVoteObjId,jdbcType=NUMERIC}, #{score,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{orgId,jdbcType=NUMERIC}, #{voteTime,jdbcType=DATE})
+	</insert>
+	
+	<select id="getAllByVoteIdAndUserId" resultMap="HyVoteResult">
+		SELECT <include refid="columns"/>
+		FROM HY_VOTE_RESULT	
+		WHERE HY_VOTE_ID = #{voteId} AND USER_ID = #{userId} 
+	</select>
+
+	<select id="calResult" resultType="java.util.HashMap">
+		SELECT * FROM (
+			SELECT B.TITLE,B.CONTENT,A.HY_VOTE_OBJ_ID,A.VOTE_NUM,A.SCORE_ALL FROM (
+	       		SELECT HY_VOTE_OBJ_ID,COUNT(1) AS VOTE_NUM,SUM(SCORE) AS SCORE_ALL FROM HY_VOTE_RESULT 
+	          WHERE HY_VOTE_ID = #{voteId}
+	          GROUP BY HY_VOTE_OBJ_ID
+			)A 
+			INNER JOIN HY_VOTE_OBJ B ON A.HY_VOTE_OBJ_ID = B.ID 
+		) TEMP
+		
+		<if test="@Ognl@isNotEmpty(orderField)">
+			order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+			order by TEMP.VOTE_NUM  DESC
+		</if>
+	</select>
+	
+	<select id="getAll" resultMap="HyVoteResult">
+		SELECT * FROM (
+			SELECT A.ID,A.HY_VOTE_ID,A.HY_VOTE_OBJ_ID,A.SCORE,USER_ID,A.ORG_ID,A.VOTE_TIME,
+				B.TITLE AS HYVOTEOBJTITLE, C.FULLNAME AS USERNAME, D.ORGNAME AS ORGNAME,D.COMPANY AS COMPANYNAME
+			FROM HY_VOTE_RESULT A
+			LEFT JOIN HY_VOTE_OBJ B	ON A.HY_VOTE_OBJ_ID = B.ID
+			LEFT JOIN SYS_USER C ON A.USER_ID = C.USERID
+	    	LEFT JOIN SYS_ORG D ON A.ORG_ID = D.ORGID 
+			WHERE A.HY_VOTE_OBJ_ID = #{voteObjId }
+		)TEMP
+		
+		<include refid="dynamicWhere" />
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+		order by ID  desc
+		</if>
+	</select>
+	
+	
+</mapper>

+ 120 - 0
web/WEB-INF/classes/com/haiya/produce/maper/SysAnswer.map.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.SysAnswer">
+	<resultMap id="SysAnswer" type="com.haiya.produce.model.oa.SysAnswer">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="questionnaireId" column="QUESTIONNAIRE_ID" jdbcType="NUMERIC"/>
+		<result property="status" column="STATUS" jdbcType="NUMERIC"/>
+		<result property="creatorId" column="CREATOR_ID" jdbcType="NUMERIC"/>
+		<result property="creatorOrgId" column="CREATOR_ORG_ID" jdbcType="NUMERIC"/>
+		<result property="createDate" column="CREATE_DATE" jdbcType="DATE"/>
+		
+		<result property="creator" column="CREATOR" jdbcType="VARCHAR"/>
+		<result property="creatorOrg" column="CREATOR_ORG" jdbcType="VARCHAR"/>
+		<result property="creatorCompanyId" column="CREATOR_COMPANY_ID" jdbcType="NUMERIC"/>
+		<result property="creatorCompany" column="CREATOR_COMPANY" jdbcType="VARCHAR"/>
+		<result property="questionnaireTitle" column="QUESTIONNAIRE_TITLE" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+	
+
+	<sql id="columns">
+		ID,QUESTIONNAIRE_ID,STATUS,CREATOR_ID,CREATOR_ORG_ID,CREATE_DATE
+	</sql>
+	
+	
+	<sql id="dynamicWhere">
+		<where>
+			<if test="@Ognl@isNotEmpty(questionnaireTitle)"> AND QUESTIONNAIRE_TITLE  LIKE #{questionnaireTitle} </if>
+			<if test="@Ognl@isNotEmpty(createDate)"> AND CREATE_DATE  =#{createDate} </if>
+			<if test="@Ognl@isNotEmpty(begincreateDate)"> AND CREATE_DATE  >=#{begincreateDate,jdbcType=DATE} </if>
+			<if test="@Ognl@isNotEmpty(endcreateDate)"> AND CREATE_DATE <![CDATA[ <=#{endcreateDate,jdbcType=DATE}]]> </if>
+		</where>
+	</sql>
+
+	<insert id="add" parameterType="com.haiya.produce.model.oa.SysAnswer">
+		INSERT INTO SYS_ANSWER
+		(ID,QUESTIONNAIRE_ID,STATUS,CREATOR_ID,CREATOR_ORG_ID,CREATE_DATE)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{questionnaireId,jdbcType=NUMERIC}, #{status,jdbcType=NUMERIC}, #{creatorId,jdbcType=NUMERIC}, #{creatorOrgId,jdbcType=NUMERIC}, #{createDate,jdbcType=DATE})
+	</insert>
+	
+	<update id="update" parameterType="com.haiya.produce.model.oa.SysAnswer">
+		UPDATE SYS_ANSWER SET
+		QUESTIONNAIRE_ID=#{questionnaireId,jdbcType=NUMERIC},
+		STATUS=#{status,jdbcType=NUMERIC},
+		CREATOR_ID=#{creatorId,jdbcType=NUMERIC},
+		CREATOR_ORG_ID=#{creatorOrgId,jdbcType=NUMERIC},
+		CREATE_DATE=#{createDate,jdbcType=DATE}
+		WHERE
+		ID=#{id}
+	</update>
+	
+	<select id="getById" parameterType="java.lang.Long" resultMap="SysAnswer">
+		SELECT <include refid="columns"/>
+		FROM SYS_ANSWER
+		WHERE
+		ID=#{id}
+	</select>
+	
+	<select id="getAll" resultMap="SysAnswer">
+		SELECT * FROM (
+			SELECT * FROM (
+				SELECT  NULL AS ID,QN.ID AS QUESTIONNAIRE_ID,1 AS STATUS,NULL AS CREATOR_ID,NULL AS CREATOR_ORG_ID,NULL AS CREATE_DATE,
+	       		NULL AS CREATOR,NULL AS CREATOR_ORG,NULL AS  CREATOR_COMPANY_ID,
+			   	NULL AS CREATOR_COMPANY,QN.TITLE AS QUESTIONNAIRE_TITLE  FROM SYS_QUESTIONNAIRE QN
+			   	WHERE QN.ID IN (
+				   	select t.OBJECT_ID from (
+						<foreach collection="relationMap" index="key"  item="ent" separator="union">
+							select rig.OBJECT_ID from sys_obj_rights rig where rig.RIGHT_TYPE=#{key} and rig.OBJ_TYPE=#{objType} 
+							<if test="@Ognl@notEquals(key,'all') and @Ognl@isNotEmpty(ent)">
+									and rig.OWNER_ID in 
+									<foreach collection="ent"  item="id" separator="," open="(" close=")">
+										#{id}
+									</foreach>
+							</if>
+						</foreach>
+					) t 
+			   	) AND QN.STATUS = 2 AND QN.ID NOT IN (SELECT QUESTIONNAIRE_ID  FROM SYS_ANSWER WHERE CREATOR_ID = #{userId})
+			   	ORDER BY QN.ID  DESC
+			)TEMP1
+			UNION ALL
+			SELECT * FROM (
+				SELECT A.ID,A.QUESTIONNAIRE_ID,A.STATUS,A.CREATOR_ID,A.CREATOR_ORG_ID,A.CREATE_DATE,
+		       		B.FULLNAME AS CREATOR,C.ORGNAME AS CREATOR_ORG,C.COMPANYID AS CREATOR_COMPANY_ID,
+				   	C.COMPANY AS CREATOR_COMPANY,D.TITLE AS QUESTIONNAIRE_TITLE
+				    FROM SYS_ANSWER  A
+				    LEFT JOIN SYS_USER B ON A.CREATOR_ID = B.USERID
+				    LEFT JOIN SYS_ORG C ON A.CREATOR_ORG_ID = C.ORGID
+				    LEFT JOIN SYS_QUESTIONNAIRE D ON A.QUESTIONNAIRE_ID = D.ID
+				    WHERE A.CREATOR_ID = #{userId} ORDER BY A.ID  DESC
+			)TEMP2
+		)TEMP
+		<include refid="dynamicWhere" />
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+	</select>
+
+	<select id="getAllForManager" resultMap="SysAnswer">
+		SELECT * FROM (
+			SELECT A.ID,A.QUESTIONNAIRE_ID,A.STATUS,A.CREATOR_ID,A.CREATOR_ORG_ID,A.CREATE_DATE,
+	       		B.FULLNAME AS CREATOR,C.ORGNAME AS CREATOR_ORG,C.COMPANYID AS CREATOR_COMPANY_ID,
+			   	C.COMPANY AS CREATOR_COMPANY,D.TITLE AS QUESTIONNAIRE_TITLE
+			    FROM SYS_ANSWER  A
+			    LEFT JOIN SYS_USER B ON A.CREATOR_ID = B.USERID
+			    LEFT JOIN SYS_ORG C ON A.CREATOR_ORG_ID = C.ORGID
+			    LEFT JOIN SYS_QUESTIONNAIRE D ON A.QUESTIONNAIRE_ID = D.ID
+			 WHERE A.STATUS = 2
+		)TEMP
+		<include refid="dynamicWhere" />
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+		ORDER BY QUESTIONNAIRE_ID,CREATE_DATE DESC
+		</if>
+	</select>
+	
+	
+</mapper>

+ 48 - 0
web/WEB-INF/classes/com/haiya/produce/maper/SysQuestion.map.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.SysQuestion">
+	<resultMap id="SysQuestion" type="com.haiya.produce.model.oa.SysQuestion">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="questionnaireId" column="QUESTIONNAIRE_ID" jdbcType="NUMERIC"/>
+		<result property="question" column="QUESTION" jdbcType="VARCHAR"/>
+		<result property="questionType" column="QUESTION_TYPE" jdbcType="NUMERIC"/>
+		<result property="questionCategory" column="QUESTION_CATEGORY" jdbcType="VARCHAR"/>
+		<result property="sn" column="SN" jdbcType="NUMERIC"/>
+		<result property="maxNum" column="MAX_NUM" jdbcType="NUMERIC"/>
+		<result property="isNeed" column="IS_NEED" jdbcType="NUMERIC"/>
+		<result property="remindWord" column="REMIND_WORD" jdbcType="VARCHAR"/>
+		
+		
+		<collection property="sysQuestionOptList" column="{questionId=ID}" ofType="com.haiya.produce.model.oa.SysQuestionOpt"
+			select="com.haiya.produce.model.oa.SysQuestionOpt.getSysQuestionOptList" >
+	    </collection>
+	</resultMap>
+	
+	<sql id="columns">
+		ID,QUESTIONNAIRE_ID,QUESTION,QUESTION_TYPE,QUESTION_CATEGORY,SN,MAX_NUM,IS_NEED,REMIND_WORD
+	</sql>
+	
+	<insert id="add" parameterType="com.haiya.produce.model.oa.SysQuestion">
+		INSERT INTO SYS_QUESTION
+		(ID,QUESTIONNAIRE_ID,QUESTION,QUESTION_TYPE,QUESTION_CATEGORY,SN,MAX_NUM,IS_NEED,REMIND_WORD)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{questionnaireId,jdbcType=NUMERIC}, #{question,jdbcType=VARCHAR}, #{questionType,jdbcType=NUMERIC}, #{questionCategory,jdbcType=VARCHAR}, #{sn,jdbcType=NUMERIC}, #{maxNum,jdbcType=NUMERIC}, #{isNeed,jdbcType=NUMERIC},#{remindWord,jdbcType=VARCHAR})
+	</insert>
+	
+	<select id="getSysQuestionList" resultMap="SysQuestion">
+	    SELECT <include refid="columns"/>
+	    FROM SYS_QUESTION 
+	    WHERE QUESTIONNAIRE_ID=#{questionnaireId}
+	    ORDER BY SN ASC
+	</select>
+	
+	<delete id="delByMainId">
+	    DELETE FROM SYS_QUESTION
+	    WHERE QUESTIONNAIRE_ID=#{questionnaireId}
+	</delete> 
+	
+	<select id="getQuestionIds" parameterType="java.util.Map" resultType="java.lang.String">
+		SELECT ID FROM SYS_QUESTION WHERE QUESTIONNAIRE_ID = #{qnId} AND QUESTION_TYPE = 3
+	</select>
+	
+</mapper>

+ 45 - 0
web/WEB-INF/classes/com/haiya/produce/maper/SysQuestionOpt.map.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.SysQuestionOpt">
+	<resultMap id="SysQuestionOpt" type="com.haiya.produce.model.oa.SysQuestionOpt">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="questionId" column="QUESTION_ID" jdbcType="NUMERIC"/>
+		<result property="options" column="OPTIONS" jdbcType="VARCHAR"/>
+		<result property="writeFlag" column="WRITE_FLAG" jdbcType="NUMERIC"/>
+		<result property="sn" column="SN" jdbcType="NUMERIC"/>
+		
+	</resultMap>
+	
+	<sql id="columns">
+		ID,QUESTION_ID,OPTIONS,WRITE_FLAG,SN
+	</sql>
+	
+	<select id="getSysQuestionOptList" resultMap="SysQuestionOpt" >
+	    SELECT <include refid="columns"/>
+	    FROM SYS_QUESTION_OPT 
+	    WHERE QUESTION_ID=#{questionId}
+	    ORDER BY SN ASC
+	</select>
+	
+	<insert id="add" parameterType="com.haiya.produce.model.oa.SysQuestionOpt">
+		INSERT INTO SYS_QUESTION_OPT
+		(ID,QUESTION_ID,OPTIONS,WRITE_FLAG,SN)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{questionId,jdbcType=NUMERIC}, #{options,jdbcType=VARCHAR}, #{writeFlag,jdbcType=NUMERIC}, #{sn,jdbcType=NUMERIC})
+	</insert>
+	
+	<delete id="delByQnId">
+    	DELETE SYS_QUESTION_OPT WHERE 
+    	QUESTION_ID IN (
+			SELECT ID FROM SYS_QUESTION WHERE QUESTIONNAIRE_ID = #{questionnaireId}
+		)
+	</delete>    
+	
+	<select id="getQuestionOptIds" parameterType="java.util.Map" resultType="java.lang.String">
+		SELECT ID FROM SYS_QUESTION_OPT WHERE QUESTION_ID IN (
+ 			SELECT ID FROM SYS_QUESTION WHERE QUESTIONNAIRE_ID = #{qnId}
+		)
+	</select>
+	
+	
+</mapper>

+ 139 - 0
web/WEB-INF/classes/com/haiya/produce/maper/SysQuestionnaire.map.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+<mapper namespace="com.haiya.produce.model.oa.SysQuestionnaire">
+	<resultMap id="SysQuestionnaire" type="com.haiya.produce.model.oa.SysQuestionnaire">
+		<id property="id" column="ID" jdbcType="NUMERIC"/>
+		<result property="title" column="TITLE" jdbcType="VARCHAR"/>
+		<result property="headContent" column="HEAD_CONTENT" jdbcType="VARCHAR"/>
+		<result property="footContent" column="FOOT_CONTENT" jdbcType="VARCHAR"/>
+		<result property="memo" column="MEMO" jdbcType="VARCHAR"/>
+		<result property="status" column="STATUS" jdbcType="NUMERIC"/>
+		<result property="creatorId" column="CREATOR_ID" jdbcType="NUMERIC"/>
+		<result property="creatorOrgId" column="CREATOR_ORG_ID" jdbcType="NUMERIC"/>
+		<result property="createDate" column="CREATE_DATE" jdbcType="DATE"/>
+		<result property="qnTemplateEdit" column="QN_TEMPLATE_EDIT" jdbcType="VARCHAR"/>
+		<result property="qnTemplateGet" column="QN_TEMPLATE_GET" jdbcType="VARCHAR"/>
+		
+		<result property="creator" column="CREATOR" jdbcType="VARCHAR"/>
+		<result property="creatorOrg" column="CREATOR_ORG" jdbcType="VARCHAR"/>
+		<result property="creatorCompanyId" column="CREATOR_COMPANY_ID" jdbcType="NUMERIC"/>
+		<result property="creatorCompany" column="CREATOR_COMPANY" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+	<sql id="columns">
+		ID,TITLE,HEAD_CONTENT,FOOT_CONTENT,MEMO,STATUS,CREATOR_ID,CREATOR_ORG_ID,CREATE_DATE,CREATOR,CREATOR_ORG,CREATOR_COMPANY_ID,CREATOR_COMPANY,QN_TEMPLATE_EDIT,QN_TEMPLATE_GET
+	</sql>
+	
+	<sql id="dynamicWhere">
+		<where>
+			<if test="@Ognl@isNotEmpty(id)"> AND ID  =#{id} </if>
+			<if test="@Ognl@isNotEmpty(title)"> AND TITLE  LIKE #{title}  </if>
+			<if test="@Ognl@isNotEmpty(headContent)"> AND CONTENT  LIKE #{headContent}  </if>
+			<if test="@Ognl@isNotEmpty(footContent)"> AND CONTENT  LIKE #{footContent}  </if>
+			<if test="@Ognl@isNotEmpty(memo)"> AND MEMO  LIKE #{memo}  </if>
+			<if test="@Ognl@isNotEmpty(status)"> AND STATUS  LIKE #{status}  </if>
+			<if test="@Ognl@isNotEmpty(creatorId)"> AND CREATOR_ID  =#{creatorId} </if>
+			<if test="@Ognl@isNotEmpty(creatorOrgId)"> AND CREATOR_ORG_ID  =#{creatorOrgId} </if>
+			<if test="@Ognl@isNotEmpty(createDate)"> AND CREATE_DATE  =#{createDate} </if>
+			<if test="@Ognl@isNotEmpty(begincreateDate)"> AND CREATE_DATE  >=#{begincreateDate,jdbcType=DATE} </if>
+			<if test="@Ognl@isNotEmpty(endcreateDate)"> AND CREATE_DATE <![CDATA[ <=#{endcreateDate,jdbcType=DATE}]]> </if>
+		</where>
+	</sql>
+
+	<insert id="add" parameterType="com.haiya.produce.model.oa.SysQuestionnaire">
+		INSERT INTO SYS_QUESTIONNAIRE
+		(ID,TITLE,HEAD_CONTENT,FOOT_CONTENT,MEMO,STATUS,CREATOR_ID,CREATOR_ORG_ID,CREATE_DATE)
+		VALUES
+		(#{id,jdbcType=NUMERIC}, #{title,jdbcType=VARCHAR}, #{headContent,jdbcType=VARCHAR}, #{footContent,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{creatorId,jdbcType=NUMERIC}, #{creatorOrgId,jdbcType=NUMERIC}, #{createDate,jdbcType=DATE})
+	</insert>
+	
+	<delete id="delById" parameterType="java.lang.Long">
+		DELETE FROM SYS_QUESTIONNAIRE 
+		WHERE
+		ID=#{id}
+	</delete>
+	
+	<update id="update" parameterType="com.haiya.produce.model.oa.SysQuestionnaire">
+		UPDATE SYS_QUESTIONNAIRE SET
+		TITLE=#{title,jdbcType=VARCHAR},
+		HEAD_CONTENT=#{headContent,jdbcType=VARCHAR},
+		FOOT_CONTENT=#{footContent,jdbcType=VARCHAR},
+		MEMO=#{memo,jdbcType=VARCHAR},
+		STATUS=#{status,jdbcType=NUMERIC},
+		CREATOR_ID=#{creatorId,jdbcType=NUMERIC},
+		CREATOR_ORG_ID=#{creatorOrgId,jdbcType=NUMERIC},
+		CREATE_DATE=#{createDate,jdbcType=DATE}
+		WHERE
+		ID=#{id}
+	</update>
+		    
+	<select id="getById" parameterType="java.lang.Long" resultMap="SysQuestionnaire">
+		SELECT 
+		    A.ID,A.TITLE,A.HEAD_CONTENT,A.FOOT_CONTENT,A.MEMO,A.STATUS,A.CREATOR_ID,A.CREATOR_ORG_ID,A.CREATE_DATE,
+		    B.FULLNAME AS CREATOR,C.ORGNAME AS CREATOR_ORG,C.COMPANYID AS CREATOR_COMPANY_ID,C.COMPANY AS CREATOR_COMPANY
+		    FROM SYS_QUESTIONNAIRE A
+		    LEFT JOIN SYS_USER B ON A.CREATOR_ID = B.USERID
+		    LEFT JOIN SYS_ORG C ON A.CREATOR_ORG_ID = C.ORGID
+		WHERE
+		ID=#{id}
+	</select>
+	
+	<select id="getAll" resultMap="SysQuestionnaire">
+		SELECT 
+		    A.ID,A.TITLE,A.HEAD_CONTENT,A.FOOT_CONTENT,A.MEMO,A.STATUS,A.CREATOR_ID,A.CREATOR_ORG_ID,A.CREATE_DATE,
+		    B.FULLNAME AS CREATOR,C.ORGNAME AS CREATOR_ORG,C.COMPANYID AS CREATOR_COMPANY_ID,
+		    C.COMPANY AS CREATOR_COMPANY
+		    FROM SYS_QUESTIONNAIRE A
+		    LEFT JOIN SYS_USER B ON A.CREATOR_ID = B.USERID
+		    LEFT JOIN SYS_ORG C ON A.CREATOR_ORG_ID = C.ORGID
+		<include refid="dynamicWhere" />
+		<if test="@Ognl@isNotEmpty(orderField)">
+		order by ${orderField} ${orderSeq}
+		</if>
+		<if test="@Ognl@isEmpty(orderField)">
+		order by ID  desc
+		</if>
+	</select>
+	
+	<update id="updateQnTemplate" parameterType="com.haiya.produce.model.oa.SysQuestionnaire">
+		UPDATE SYS_QUESTIONNAIRE SET
+		QN_TEMPLATE_EDIT=#{qnTemplateEdit,jdbcType=VARCHAR},
+		QN_TEMPLATE_GET=#{qnTemplateGet,jdbcType=VARCHAR}
+		WHERE
+		ID=#{id}
+	</update>
+	
+	<select id="getQnTemplateEditById" resultType="java.lang.String">
+		SELECT QN_TEMPLATE_EDIT FROM SYS_QUESTIONNAIRE WHERE ID = #{id}
+	</select>
+
+	<select id="getQnTemplateGetById" resultType="java.lang.String">
+		SELECT QN_TEMPLATE_GET FROM SYS_QUESTIONNAIRE WHERE ID = #{id}
+	</select>
+	
+	<update id="updateStatus" >
+		UPDATE SYS_QUESTIONNAIRE SET
+		STATUS=#{status,jdbcType=NUMERIC}
+		WHERE
+		ID=#{id}
+	</update>
+	
+	<select id="getMyQuestionnaireNum" resultType="java.lang.Integer">
+		SELECT COUNT(1) AS NUM FROM SYS_QUESTIONNAIRE QN
+			WHERE QN.ID IN (
+				select t.OBJECT_ID from (
+					<foreach collection="relationMap" index="key"  item="ent" separator="union">
+						select rig.OBJECT_ID from sys_obj_rights rig where rig.RIGHT_TYPE=#{key} and rig.OBJ_TYPE=#{objType} 
+						<if test="@Ognl@notEquals(key,'all') and @Ognl@isNotEmpty(ent)">
+								and rig.OWNER_ID in 
+								<foreach collection="ent"  item="id" separator="," open="(" close=")">
+									#{id}
+								</foreach>
+						</if>
+					</foreach>
+				) t 
+			) AND QN.STATUS = 2 AND QN.ID NOT IN (SELECT QUESTIONNAIRE_ID  FROM SYS_ANSWER WHERE CREATOR_ID = #{userId})
+	</select>
+	
+	
+</mapper>

BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/HyVote.class


BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/HyVoteObj.class


BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/HyVotePrivilege.class


BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/HyVoteResult.class


BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/SysAnswer.class


BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/SysAnswerDetail.class


BIN
web/WEB-INF/classes/com/haiya/produce/model/oa/SysQuestionnaire.class


BIN
web/WEB-INF/classes/com/haiya/produce/script/HaiyaScript.class


BIN
web/WEB-INF/classes/com/haiya/produce/service/oa/HyBudgetService.class


BIN
web/WEB-INF/classes/com/haiya/produce/service/oa/HyVoteResultService.class


BIN
web/WEB-INF/classes/com/haiya/produce/service/oa/HyVoteService.class


BIN
web/WEB-INF/classes/com/haiya/produce/servlet/KaoQinServlet.class


+ 0 - 0
web/WEB-INF/classes/com/hotent/Test.class


Vissa filer visades inte eftersom för många filer har ändrats