|
|
@@ -2781,30 +2781,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
Element table = doc.select("table").first();
|
|
|
// 组装电签设置
|
|
|
Elements dqids = table.getElementsByAttribute("dqid");
|
|
|
- // 电签组装2
|
|
|
- String dqSql = "select e_key,GROUP_CONCAT(DISTINCT concat('*✹',id)) ids from u_sign_key_role_info where tab_en_name='" + tabName + "' GROUP BY e_key";
|
|
|
- List<Map<String, Object>> mapList = jdbcTemplate.queryForList(dqSql);
|
|
|
- if(mapList!=null && mapList.size()>0){
|
|
|
- for(Map<String, Object> map : mapList) {
|
|
|
- Elements elementsBy = table.getElementsByAttributeValueStarting("keyname", map.get("e_key") + "_");
|
|
|
- if(elementsBy!=null && elementsBy.size()>0){
|
|
|
- for(Element element : elementsBy){
|
|
|
- String dqIds = (String) map.get("ids");
|
|
|
- dqIds = dqIds.replace(",","");
|
|
|
- dqIds = dqIds.substring(1);
|
|
|
- element.attr("sign_type", dqIds);
|
|
|
- dqids.add(element);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
for (Element element : dqids) {
|
|
|
- String dqid="";
|
|
|
- if(element.hasAttr("sign_type")){
|
|
|
- dqid = element.attr("sign_type");
|
|
|
- }else{
|
|
|
- dqid = element.attr("dqid");
|
|
|
- }
|
|
|
+ String dqid = element.attr("dqid");
|
|
|
|
|
|
int x1 = 0;
|
|
|
int y1 = 0;
|
|
|
@@ -2850,6 +2828,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/*设置电签时间*/
|
|
|
private void dianqianTime(String htmlUrl, Sheet sheet, Workbook workbook, Long pkeyId, Long perId, Long contractId) {
|
|
|
String timeSql = "SELECT DISTINCT a.time_col_key,DATE_FORMAT(c.create_time, '%Y年%m月%d日') as create_time from m_textdict_info a ,m_project_assignment_user b,u_task_parallel c ,u_task d where a.sig_role_id=b.role_id and b.user_id=c.task_user and c.process_instance_id=d.process_instance_id and b.contract_id=" + contractId + " and LENGTH(a.time_col_key)>=2 " +
|
cr