|
|
|
@ -2,14 +2,11 @@ package com.his.yfyk.service; |
|
|
|
|
|
|
|
|
|
import java.sql.Timestamp; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Calendar; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.Iterator; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
import com.his.yfyk.model.YptkModel; |
|
|
|
|
import com.util.MainLog; |
|
|
|
|
import com.util.MainUtil; |
|
|
|
|
import com.util.SnowIdUtils; |
|
|
|
|
import com.wat.core.config.DaoCreator; |
|
|
|
@ -285,6 +282,7 @@ public class YptkService { |
|
|
|
|
String jgid=histhddao.getColumnValueAsString("JGID"); |
|
|
|
|
String dptid=histhddao.getColumnValueAsString("DPTID"); |
|
|
|
|
String djh=histhddao.getColumnValueAsString("DJH"); |
|
|
|
|
String SHZT=histhddao.getColumnValueAsString("SHZT"); |
|
|
|
|
if(lbwc){ |
|
|
|
|
for(int i=histhdmxdao.getRowCount()-1;i>=0;i--){ |
|
|
|
|
String rkpkey=histhdmxdao.getColumnValueAsString(i,"RKDMX_PKEY"); |
|
|
|
@ -389,6 +387,13 @@ public class YptkService { |
|
|
|
|
} |
|
|
|
|
if(histhddao.getRowCount()>0) lb=true; |
|
|
|
|
}else{ |
|
|
|
|
|
|
|
|
|
if ("1".equals(SHZT)){ |
|
|
|
|
model.setResult(-1); |
|
|
|
|
model.setMessage("错误:已审核状态,不可取消完成!"); |
|
|
|
|
return model; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
lb=true; |
|
|
|
|
for(int i=0;i<histhdmxdao.getRowCount();i++){ |
|
|
|
|
String sfxbm=histhdmxdao.getColumnValueAsString(i,"SFX_BM"); |
|
|
|
|