|
|
@@ -242,6 +242,8 @@ public class ScrDataServiceImpl implements ScrDataService {
|
|
|
total = Func.toInt(map.get("total"));
|
|
|
pCount = Func.toInt(map.get("pCount"));
|
|
|
}
|
|
|
+ Object o = map.get("initiative");
|
|
|
+ Object o1 = map.get("status");
|
|
|
if((map.get("initiative")+"").equals("2") && (map.get("status")+"").equals("2")){
|
|
|
strArray.add(map.get("task_user").toString());
|
|
|
}
|
|
|
@@ -271,6 +273,12 @@ public class ScrDataServiceImpl implements ScrDataService {
|
|
|
List<Map<String, Object>> maps2 = null;
|
|
|
if (dqIds.length() > 0) {
|
|
|
String sqlinfo = " SELECT * from ( SELECT a.id as keyWord,a.project_id,a.pyzbx ,a.pyzby,(SELECT acc_code from blade_user where id='" + strArray.get(i) + "' and is_deleted=0 ) as sealId from m_textdict_info a where a.type =2 and a.id in (" + dqIds + ") and sig_role_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c where c.contract_id=" + task.getContractId() + " and user_id=" + strArray.get(i) + " and c.is_deleted=0 ) ) x where x.sealId is not null ";
|
|
|
+ if (total==pCount) {
|
|
|
+ sqlinfo = "SELECT a.id as keyWord,a.pyzbx,a.pyzby,b.certificate_number as sealId from m_textdict_info a ,m_sign_pfx_file b where a.sig_role_id = b.pfx_type and b.project_contract_role like '%" + task.getContractId() + "%' and a.is_deleted=0 and b.is_deleted=0 and a.type=6 and a.id in(" + dqIds + ")";
|
|
|
+ System.out.println("东方中讯--签章--" + sqlinfo);
|
|
|
+ } else {
|
|
|
+ System.out.println("东方中讯--签字--" + sqlinfo);
|
|
|
+ }
|
|
|
maps2 = jdbcTemplate.queryForList(sqlinfo);
|
|
|
}
|
|
|
if(CollectionUtil.isNotEmpty(maps2)) {
|
cr