报告信息调整,人员查询修改
This commit is contained in:
parent
d933ac4197
commit
d95446874f
@ -329,6 +329,21 @@ public class RegTransitSample {
|
||||
*/
|
||||
private String cancelName;
|
||||
|
||||
/**
|
||||
* 上机时间
|
||||
*/
|
||||
private Date operdatetime;
|
||||
|
||||
/**
|
||||
* 上机人代码
|
||||
*/
|
||||
private String opercode;
|
||||
|
||||
/**
|
||||
* 上机人姓名
|
||||
*/
|
||||
private String opername;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
</resultMap>
|
||||
|
||||
<select id="getSysUserOne" parameterType="String" resultMap="SysUserResult">
|
||||
select * from sys_user where user_name = #{user_name}
|
||||
select * from sys_user where user_name = #{user_name} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
@ -32,6 +32,7 @@ public class RegLisReportServiceImpl implements RegLisReportService {
|
||||
@Override
|
||||
public Result printLisReport(String bgdh) {
|
||||
String isGetPdfdata = commonUtil.selectConfigByKey("IS_GET_PDFDATA");
|
||||
if(bgdh == null || bgdh.equals("")) return new Result("-1","报告还未出!");
|
||||
if("1".equals(isGetPdfdata)){
|
||||
//使用接口去查询数据
|
||||
String jsonStr = "{\"method\":\"pdfData\",\"bgdh\":\""+bgdh+"\"}";
|
||||
|
||||
@ -89,6 +89,9 @@
|
||||
<if test="ExpressNum != null and ExpressNum != ''">ExpressNum,</if>
|
||||
<if test="slzq != null and slzq != ''">slzq,</if>
|
||||
<if test="checkPUR != null and checkPUR != ''">checkPUR,</if>
|
||||
<if test="operdatetime != null">operdatetime,</if>
|
||||
<if test="opercode != null and opercode != ''">opercode,</if>
|
||||
<if test="opername != null and opername != ''">opername,</if>
|
||||
create_by,create_time,update_by,update_time
|
||||
)values(
|
||||
<if test="PatId != null and PatId != ''">#{PatId},</if>
|
||||
@ -147,6 +150,9 @@
|
||||
<if test="ExpressNum != null and ExpressNum != ''">#{ExpressNum},</if>
|
||||
<if test="slzq != null and slzq != ''">#{slzq},</if>
|
||||
<if test="checkPUR != null and checkPUR != ''">#{checkPUR},</if>
|
||||
<if test="operdatetime != null">#{operdatetime},</if>
|
||||
<if test="opercode != null and opercode != ''">#{opercode},</if>
|
||||
<if test="opername != null and opername != ''">#{opername},</if>
|
||||
#{create_by},#{create_time},#{update_by},#{update_time}
|
||||
)
|
||||
</insert>
|
||||
@ -275,6 +281,9 @@
|
||||
<if test="cancelTime != null ">cancelTime = #{cancelTime},</if>
|
||||
<if test="cancelCode != null and cancelCode != ''">cancelCode = #{cancelCode},</if>
|
||||
<if test="cancelName != null and cancelName != ''">cancelName = #{cancelName},</if>
|
||||
<if test="operdatetime != null ">operdatetime = #{operdatetime},</if>
|
||||
<if test="opercode != null and opercode != ''">opercode = #{opercode},</if>
|
||||
<if test="opername != null and opername != ''">opername = #{opername},</if>
|
||||
update_by = #{update_by},update_time = #{update_time}
|
||||
</set>
|
||||
where barcode = #{barcode}
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample' AND COLUMN_NAME = 'operdatetime')
|
||||
begin
|
||||
alter table dbo.reg_TransitSample add operdatetime datetime
|
||||
end
|
||||
|
||||
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample' AND COLUMN_NAME = 'opercode')
|
||||
begin
|
||||
alter table dbo.reg_TransitSample add opercode varchar(20)
|
||||
end
|
||||
|
||||
if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'reg_TransitSample' AND COLUMN_NAME = 'opername')
|
||||
begin
|
||||
alter table dbo.reg_TransitSample add opername varchar(50)
|
||||
end
|
||||
Loading…
x
Reference in New Issue
Block a user