zgyw.git - Gitblit

			@@ -13,18 +13,23 @@
			<result column="deduct_money" property="deductMoney"/>
			<result column="latest_time" property="latestTime"/>
			<result column="update_by" property="updateBy"/>
			<result column="can_publish" property="canPublish"/>
			<result column="status" property="status"/>
			<result column="latestDeductMoney" property="latestDeductMoney"/>
			</resultMap>

			<select id="page" resultMap="BaseResultMap">
			SELECT
			tyu.unit_name,
			tc.name,
			tcr.id,
			tcr.deduct_money,
			tcr.create_time,
			tcr.update_time,
			tcr.calculate_time,
			tcr.latest_time
			tyu.unit_name,
			tc.name,
			tcr.id,
			tcr.status,
			tcr.deduct_money,
			tcr.create_time,
			tcr.update_time,
			tcr.calculate_time,
			tcr.latest_time,
			(SELECT a.deduct_money FROM (SELECT deduct_money,which_year, which_month FROM t_calculate_record WHERE contract_id = tcr.contract_id ORDER BY which_year, which_month DESC limit 1) a) as latestDeductMoney
			FROM
			t_calculate_report tcr
			INNER JOIN t_contract tc ON tcr.contract_id = tc.id
			@@ -45,6 +50,7 @@
			<result column="contract_id" property="contractId"/>
			<result column="calculate_time" property="calculateTime"/>
			<result column="deduct_money" property="deductMoney"/>
			<result column="status" property="status"/>
			<collection property="ruleList" column="contract_id" ofType="com.ycl.platform.domain.vo.CalculateMoneyRuleVO"
			select="selectRuleByContractId"/>
			<collection property="recordList" column="contract_id" ofType="com.ycl.platform.domain.vo.CalculateRecordVO"
			@@ -85,7 +91,8 @@
			tcr.deduct_money,
			tcr.create_time,
			tcr.update_time,
			tcr.calculate_time
			tcr.calculate_time,
			tcr.status
			FROM t_calculate_report tcr
			INNER JOIN t_contract tc ON tcr.contract_id = tc.id
			INNER JOIN t_yw_unit tyu ON tyu.id = tc.unit_id