Compare commits
No commits in common. "ae76ebb2ba2e5b1f195587091e350b3a924a4912" and "5ad5abacd14c53525f895b137c6ce6805b78d939" have entirely different histories.
ae76ebb2ba
...
5ad5abacd1
|
@ -4,8 +4,10 @@ import java.io.Serializable;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
@ -122,7 +124,4 @@ public class Xxhbjwxtxsmd implements Serializable {
|
||||||
@Excel(name = "ksxzmc", width = 15)
|
@Excel(name = "ksxzmc", width = 15)
|
||||||
@ApiModelProperty(value = "ksxzmc")
|
@ApiModelProperty(value = "ksxzmc")
|
||||||
private java.lang.String ksxzmc;
|
private java.lang.String ksxzmc;
|
||||||
|
|
||||||
@TableField(exist = false)
|
|
||||||
private String studentPath;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,9 +2,4 @@
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="org.jeecg.modules.demo.xxhbjwxtxsmd.mapper.XxhbjwxtxsmdMapper">
|
<mapper namespace="org.jeecg.modules.demo.xxhbjwxtxsmd.mapper.XxhbjwxtxsmdMapper">
|
||||||
|
|
||||||
<select id="selectPage" resultType="org.jeecg.modules.demo.xxhbjwxtxsmd.entity.Xxhbjwxtxsmd">
|
|
||||||
select a.*,b.student_path from xxhbjwxtxsmd a
|
|
||||||
left join (select SUBSTRING(name FROM 1 FOR 10) as student_no,name,path as student_path,cjr,cjsj,kcrwdm from xxhbjwxtscwjxx) b on a.kcrwdm =b.kcrwdm and a.xsbh = b.student_no
|
|
||||||
${ew.customSqlSegment}
|
|
||||||
</select>
|
|
||||||
</mapper>
|
</mapper>
|
|
@ -24,7 +24,7 @@
|
||||||
<a-row class="item-header-border">
|
<a-row class="item-header-border">
|
||||||
<a-col :span="16">
|
<a-col :span="16">
|
||||||
<span class="item-title" style="font-weight: bold;">{{notice.titile}}</span>
|
<span class="item-title" style="font-weight: bold;">{{notice.titile}}</span>
|
||||||
<span :class="notice.sendStatus=='0'?'state-cg':notice.sendStatus=='1'?'state-fb':'state-cx'">{{notice.sendStatus}}-{{showDictValue(notice.sendStatus, statusData)}}</span>
|
<span class="state-cx">{{showDictValue(notice.sendStatus, statusData)}}</span>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="8" class="item-text-right">
|
<a-col :span="8" class="item-text-right">
|
||||||
<a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button>
|
<a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button>
|
||||||
|
|
Loading…
Reference in New Issue