修复bug
This commit is contained in:
@@ -193,7 +193,7 @@ public class AssetsService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
Map<String, Object> fieldsMap = formColumn.getFieldsMap();
|
Map<String, Object> fieldsMap = formColumn.getFieldsMap();
|
||||||
return getStringValue(fieldsMap,"合同编号");
|
return getStringValue(fieldsMap,"租赁-合同编号");
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContractAssetsVo queryContractAssetsDetail(JSONObject params) throws Exception {
|
public ContractAssetsVo queryContractAssetsDetail(JSONObject params) throws Exception {
|
||||||
|
|||||||
@@ -128,6 +128,7 @@ public class WaeBillService {
|
|||||||
conditions.add(FormWhereCondition.build().display("唯一标识").value(billNo));
|
conditions.add(FormWhereCondition.build().display("唯一标识").value(billNo));
|
||||||
FormColumn formColumn = formDataOperator.queryOneRowFormData(getFormNo(), true, null, conditions);
|
FormColumn formColumn = formDataOperator.queryOneRowFormData(getFormNo(), true, null, conditions);
|
||||||
if(formColumn == null) {
|
if(formColumn == null) {
|
||||||
|
System.out.println("根据唯一标识查询水电费账单失败");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
Map<String, Object> fieldsMap = formColumn.getFieldsMap();
|
Map<String, Object> fieldsMap = formColumn.getFieldsMap();
|
||||||
|
|||||||
@@ -139,6 +139,8 @@ public class FormDataOperator {
|
|||||||
Map<String, Object> generateSql = generateSql(queryColumns, conditionVos, tableName);
|
Map<String, Object> generateSql = generateSql(queryColumns, conditionVos, tableName);
|
||||||
String sql = (String) generateSql.get("sql");
|
String sql = (String) generateSql.get("sql");
|
||||||
List<Object> params = (List<Object>) generateSql.get("params");
|
List<Object> params = (List<Object>) generateSql.get("params");
|
||||||
|
log.info("sql: " + sql);
|
||||||
|
log.info("params: " + params);
|
||||||
JDBCAgent jdbcAgent = new JDBCAgent();
|
JDBCAgent jdbcAgent = new JDBCAgent();
|
||||||
List<FormColumn> columns = new ArrayList<>();
|
List<FormColumn> columns = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -138,19 +138,19 @@ public class EsignMultipleSignerNode extends ACommonSuperNode {
|
|||||||
Signer aSigner = createOrgSigner(
|
Signer aSigner = createOrgSigner(
|
||||||
fileId,null, aPositions, 1, null, null, null, null, null, null,true
|
fileId,null, aPositions, 1, null, null, null, null, null, null,true
|
||||||
,sealId);
|
,sealId);
|
||||||
buildALegalSignField(true,lpPositions,fileId,aSigner.getSignFields());
|
buildALegalSignField(true,lpPositions,fileId,aSigner.getSignFields(),formDataVo.getFieldData("选择法人章").getStringValue());
|
||||||
List<Signer> signers = new ArrayList<>();
|
List<Signer> signers = new ArrayList<>();
|
||||||
signers.add(bSigner);
|
signers.add(bSigner);
|
||||||
signers.add(aSigner);
|
signers.add(aSigner);
|
||||||
return signers;
|
return signers;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buildALegalSignField(Boolean autoSign,List<SignFieldPosition> lpPositions,String fileId,List<SignField> signFields){
|
private void buildALegalSignField(Boolean autoSign,List<SignFieldPosition> lpPositions,String fileId,List<SignField> signFields,String legalSealId){
|
||||||
for (SignFieldPosition lpPosition : lpPositions) {
|
for (SignFieldPosition lpPosition : lpPositions) {
|
||||||
NormalSignFieldConfig fieldConfig = new NormalSignFieldConfig();
|
NormalSignFieldConfig fieldConfig = new NormalSignFieldConfig();
|
||||||
lpPosition.setPositionX(lpPosition.getPositionX() + 100f);
|
lpPosition.setPositionX(lpPosition.getPositionX() + 100f);
|
||||||
fieldConfig.setSignFieldPosition(lpPosition);
|
fieldConfig.setSignFieldPosition(lpPosition);
|
||||||
fieldConfig.setAssignedSealId(configProvider.getBizConfigByKey(RentConstants.legalSealId));
|
fieldConfig.setAssignedSealId(legalSealId);
|
||||||
fieldConfig.setAutoSign(autoSign);
|
fieldConfig.setAutoSign(autoSign);
|
||||||
fieldConfig.setSignFieldStyle(1);
|
fieldConfig.setSignFieldStyle(1);
|
||||||
SignField field = new SignField();
|
SignField field = new SignField();
|
||||||
|
|||||||
Reference in New Issue
Block a user