电子签章流程部分调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/util/SignaturePostUtil.java

@@ -40,14 +40,14 @@ import java.util.zip.ZipFile;
 public class SignaturePostUtil {
 
     //竖版模板templateId
-    private static final String VERTICALTEMPLATEID = Global.getConfig("vertical_templateId");
+    private static final String VERTICALTEMPLATEID = "2894156236229259396";
     //横板模板templateId
-    private static final String ACROSSTEMPLATEID = Global.getConfig("across_templateId");
-    private static final String HTTPTOP = Global.getConfig("signature_http_top");
+    private static final String ACROSSTEMPLATEID = "2894156210627227768";
+    private static final String HTTPTOP = "http://192.168.2.130:9182";
 
-    private final static String apptoken = Global.getConfig("apptoken");
+    private final static String apptoken = "uIJQmTwyGJ";
     private final static String appsecret = Global.getConfig("appsecret");
-    private final static String signature = Global.getConfig("signature");
+    private final static String signature = "232a44ee9ebd251d119f0a65628f678e";
 
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectRecords.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -66,4 +67,7 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     List<String> isUseByReim(String[] idArray);
 
     List<String> isUseByFinance(String[] idArray);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updatereportReviewById(CwProjectRecords records);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -441,4 +441,17 @@
             #{id}
         </foreach>
     </select>
+
+    <update id="updatereportReviewById">
+        UPDATE cw_project_records
+        SET
+        <if test="reportReview != null and reportReview != ''">
+            report_review = #{reportReview},
+        </if>
+        update_by_id = #{updateById},
+        update_time = #{updateTime}
+        WHERE
+            id = #{id}
+            AND del_flag = 0
+    </update>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -250,8 +250,8 @@ public class CwProjectReportSignatureCallBackController {
             }else{
                 path = "/attachment-file/";
             }
-            String aliyunUrl = Global.getAliyunUrl();
-            String aliDownloadUrl = Global.getAliDownloadUrl();
+            String aliyunUrl = "http://cdn.gangwaninfo.com";
+            String aliDownloadUrl = "http://oss.gangwaninfo.com";
 
 
             String file = aliyunUrl + signatureUrl;
@@ -399,8 +399,8 @@ public class CwProjectReportSignatureCallBackController {
             }else{
                 path = "/attachment-file/";
             }
-            String aliyunUrl = Global.getAliyunUrl();
-            String aliDownloadUrl = Global.getAliDownloadUrl();
+            String aliyunUrl = "http://cdn.gangwaninfo.com";
+            String aliDownloadUrl = "http://oss.gangwaninfo.com";
 
 
             String file = aliyunUrl + signatureUrl;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectInfoData.java

@@ -26,7 +26,7 @@ public class CwProjectInfoData extends BaseEntity {
     private String deleteSign;
 
     //报告文号（字典值） 基字
-    public static final String BIZ_CODE = "  ";
+    public static final String BIZ_CODE = "23";
 
     //报告文号（字典值） 咨字
     public static final String CONSULT_BIZ_CODE = "24";

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectInfoData;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,6 +24,7 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
 
     CwProjectInfoData selectIdByReportId(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectInfoData selectByReportId(String id);
 
     CwProjectInfoData selectContainDelByReportId(String id);
@@ -33,6 +35,7 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
      */
     List<String> getReportNo();
 
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectInfoData selectInfoByReportId(String id);
 
     /**
@@ -70,6 +73,7 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
      * @param id
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectInfoData getByReportId(String id);
 
     CwProjectInfoData getContainDelByReportId(String id);
@@ -94,4 +98,7 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
      * @param id
      */
     void saveById(@Param("id")String id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updateCwProjectInfoDataById(CwProjectInfoData cwProjectInfoData);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,6 +39,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
 
     Integer deleteAttachement(@Param("id") String id,@Param("attachmentFlag") String attachmentFlag);
 
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectReportData queryById(@Param("id") String id);
 
     /**
@@ -48,6 +50,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      */
     public IPage<CwWorkClientBaseDTO> findClineList(Page<CwWorkClientBaseDTO> page, @Param(Constants.WRAPPER) QueryWrapper<CwWorkClientBase> queryWrapper);
 
+    @InterceptorIgnore(tenantLine = "true")
     String getUserNameById(String id);
 
     /**
@@ -86,6 +89,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param projectId
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<CwProjectReportData> getByProjectId(String projectId);
 
     List<CwProjectReportData> getContainDelByProjectId(String projectId);
@@ -136,8 +140,10 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @param postName
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<ReviewUser> getReviewByPost(@Param("postName") String postName);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentDto> findDtos(@Param("id") String id);
 
     CwProjectReport getByNewLineId(String reportId);
@@ -177,4 +183,10 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
     void updateAnnotatorById(@Param("report")CwProjectReport cwProjectReport);
 
     void saveById(@Param("id")String id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updateCwProjectReportDataById(CwProjectReport cwProjectReportData);
+
+    @InterceptorIgnore(tenantLine = "true")
+    CwProjectReport getById(@Param("id") String id);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportReviewMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportData;
 import com.jeeplus.finance.projectReport.domain.CwProjectReview;
@@ -14,6 +15,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface CwProjectReportReviewMapper extends BaseMapper<CwProjectReview> {
 
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectReview selectByReportId(String id);
 
     void updateReviewStatysByReportId(@Param("reviewStatus") String reviewStatus,@Param("id") String id,
@@ -41,4 +43,11 @@ public interface CwProjectReportReviewMapper extends BaseMapper<CwProjectReview>
      */
     ReportNoDto getProjectReportByNumber(String number);
 
+
+    @InterceptorIgnore(tenantLine = "true")
+    CwProjectReview selectById(String id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updateReviewById(CwProjectReview review);
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportSignatureMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportSignature;
 import org.apache.ibatis.annotations.Mapper;
@@ -9,6 +10,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CwProjectReportSignatureMapper extends BaseMapper<CwProjectReportSignature> {
+    @InterceptorIgnore(tenantLine = "true")
+    CwProjectReportSignature getInfoById(String id);
 
 }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProofreadDetailMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProofreadDetail;
 import org.apache.ibatis.annotations.Param;
@@ -9,10 +10,14 @@ import java.util.List;
 public interface CwProofreadDetailMapper extends BaseMapper<CwProofreadDetail> {
 
     List<CwProofreadDetail> findByInfoId(@Param("id") String id);
-
+    @InterceptorIgnore(tenantLine = "true")
     List<CwProofreadDetail> findByReportInfoId(@Param("id") String id);
 
     List<CwProofreadDetail> findList(@Param("type")String type);
 
+    @InterceptorIgnore(tenantLine = "true")
     CwProofreadDetail getByTypeIdAndInfoId(@Param("typeId")String typeId,@Param("infoId")String infoId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updateReportReviewInfoById(CwProofreadDetail detail);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/ProjectReportWorkAttachmentMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReport.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportFile;
 import com.jeeplus.finance.projectReport.service.dto.ProjectReportWorkAttachmentDTO;
@@ -27,10 +28,13 @@ public interface ProjectReportWorkAttachmentMapper extends BaseMapper<CwProjectR
 
     void deleteByAttachMnentId(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<ProjectReportWorkAttachmentDTO> selectByInfoId(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<ProjectReportWorkAttachmentDTO> selectByInfoIdAndNewLineId(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     CwProjectReportFile selectInfoByFileId(@Param("id") String id,@Param("fileType") String fileTType);
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectInfoMapper.xml

@@ -66,4 +66,50 @@
     <update id="saveById">
         update cw_project_report_new_line set del_flag = '0' where id = #{id}
     </update>
+
+    <update id="updateCwProjectInfoDataById">
+        update cw_project_report_new_line set
+        <if test="delFlag != null and delFlag != ''">
+            del_flag = #{delFlag},
+        </if>
+        <if test="reportId != null and reportId != ''">
+            report_id = #{reportId},
+        </if>
+        <if test="servedUnitId != null and servedUnitId != ''">
+            served_unit_id = #{servedUnitId},
+        </if>
+        <if test="reportDate != null and reportDate != ''">
+            report_date = #{reportDate},
+        </if>
+        <if test="reportType != null and reportType != ''">
+            report_type = #{reportType},
+        </if>
+        <if test="reportNumber != null and reportNumber != ''">
+            report_number = #{reportNumber},
+        </if>
+        <if test="reportNo != null and reportNo != ''">
+            report_no = #{reportNo},
+        </if>
+        <if test="issueReport != null and issueReport != ''">
+            issue_report = #{issueReport},
+        </if>
+        <if test="opinionType != null and opinionType != ''">
+            opinion_type = #{opinionType},
+        </if>
+        <if test="sealType != null and sealType != ''">
+            seal_type = #{sealType},
+        </if>
+        <if test="fileNumber != null and fileNumber != ''">
+            file_number = #{fileNumber},
+        </if>
+        <if test="deleteSign != null and deleteSign != ''">
+            delete_sign = #{deleteSign},
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            tenant_id = #{tenantId},
+        </if>
+        update_by_id = #{updateById},
+        update_time = #{updateTime}
+        where id = #{id}
+    </update>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -640,4 +640,110 @@
     <update id="saveById">
         update cw_project_report set del_flag = '0' where id = #{id}
     </update>
+
+
+
+    <update id="updateCwProjectReportDataById">
+        update cw_project_report
+        set
+        <if test="delFlag != null and delFlag != ''">
+            del_flag = ${delFlag},
+        </if>
+        <if test="documentNo != null and documentNo != ''">
+            document_no = ${documentNo},
+        </if>
+        <if test="projectId != null and projectId != ''">
+            project_id = ${projectId},
+        </if>
+        <if test="officeId != null and officeId != ''">
+            office_id = ${officeId},
+        </if>
+        <if test="signatureType != null and signatureType != ''">
+            signature_type = ${signatureType},
+        </if>
+        <if test="signatureAnnotator1 != null and signatureAnnotator1 != ''">
+            signature_annotator1 = ${signatureAnnotator1},
+        </if>
+        <if test="signatureAnnotator2 != null and signatureAnnotator2 != ''">
+            signature_annotator2 = ${signatureAnnotator2},
+        </if>
+        <if test="signatureContractId != null and signatureContractId != ''">
+            signature_contract_id = ${signatureContractId},
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            proc_ins_id = ${procInsId},
+        </if>
+        <if test="status != null and status != ''">
+            status = ${status},
+        </if>
+        <if test="processDefinitionId != null and processDefinitionId != ''">
+            process_definition_id = ${processDefinitionId},
+        </if>
+        <if test="auditFees != null and auditFees != ''">
+            audit_fees = ${auditFees},
+        </if>
+        <if test="businessType != null and businessType != ''">
+            business_type = ${businessType},
+        </if>
+        <if test="auditBusinessType != null and auditBusinessType != ''">
+            audit_business_type = ${auditBusinessType},
+        </if>
+        <if test="registerAddress != null and registerAddress != ''">
+            register_address = ${registerAddress},
+        </if>
+        <if test="businessLocation != null and businessLocation != ''">
+            business_location = ${businessLocation},
+        </if>
+        <if test="securityBusiness != null and securityBusiness != ''">
+            security_business = ${securityBusiness},
+        </if>
+        <if test="industry != null and industry != ''">
+            industry = ${industry},
+        </if>
+        <if test="businessObjects != null and businessObjects != ''">
+            business_objects = ${businessObjects},
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            tenant_id = ${tenantId},
+        </if>
+        update_by_id = #{updateById},
+        update_time = #{updateTime}
+        where del_flag = 0 and id = #{id}
+    </update>
+
+    <select id="getById" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
+        SELECT
+            id,
+            remarks,
+            document_no,
+            project_id,
+            office_id,
+            signature_annotator1,
+            signature_annotator2,
+            signature_type,
+            proc_ins_id,
+            process_definition_id,
+            STATUS,
+            signature_contract_id,
+            real_create,
+            audit_fees,
+            business_type,
+            audit_business_type,
+            register_address,
+            business_location,
+            security_business,
+            industry,
+            business_objects,
+            create_time,
+            create_by_id,
+            update_time,
+            update_by_id,
+            del_flag,
+            tenant_id
+        FROM
+            cw_project_report
+        WHERE
+            id = #{id}
+            AND del_flag = 0
+    </select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportReviewMapper.xml

@@ -34,4 +34,99 @@
         limit 1
     </select>
 
+    <select id="selectById" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReview">
+        SELECT
+            id,
+            proc_ins_id,
+            process_definition_id,
+            review_status,
+            all_print_num,
+            issue_num,
+            place_on_file_num,
+            printed_by,
+            check_autograph,
+            report_id,
+            report_review_no,
+            report_title_type,
+            need_update1,
+            need_update2,
+            need_update3,
+            remark1,
+            remark2,
+            remark3,
+            computer_no,
+            review_by,
+            create_time,
+            create_by_id,
+            update_time,
+            update_by_id,
+            del_flag,
+            tenant_id
+        FROM
+            cw_project_report_review
+        WHERE
+            id = #{id}
+    </select>
+
+    <update id="updateReviewById">
+        UPDATE cw_project_report_review
+        SET
+        <if test="reviewStatus != null and reviewStatus != ''">
+            review_status = #{reviewStatus},
+        </if>
+        <if test="allPrintNum != null and allPrintNum != ''">
+            all_print_num = #{allPrintNum},
+        </if>
+        <if test="issueNum != null and issueNum != ''">
+            issue_num = #{issueNum},
+        </if>
+        <if test="placeOnFileNum != null and placeOnFileNum != ''">
+            place_on_file_num = #{placeOnFileNum},
+        </if>
+        <if test="printedBy != null and printedBy != ''">
+            printed_by = #{printedBy},
+        </if>
+        <if test="checkAutograph != null and checkAutograph != ''">
+            check_autograph = #{checkAutograph},
+        </if>
+        <if test="reportReviewNo != null and reportReviewNo != ''">
+            report_review_no = #{reportReviewNo},
+        </if>
+        <if test="reportTitleType != null and reportTitleType != ''">
+            report_title_type = #{reportTitleType},
+        </if>
+        <if test="reportTitleType != null and reportTitleType != ''">
+            report_title_type = #{reportTitleType},
+        </if>
+        <if test="needUpdate1 != null and needUpdate1 != ''">
+            need_update1 = #{needUpdate1},
+        </if>
+        <if test="needUpdate2 != null and needUpdate2 != ''">
+            need_update2 = #{needUpdate2},
+        </if>
+        <if test="needUpdate3 != null and needUpdate3 != ''">
+            need_update3 = #{needUpdate3},
+        </if>
+        <if test="remark1 != null and remark1 != ''">
+            remark1 = #{remark1},
+        </if>
+        <if test="remark2 != null and remark2 != ''">
+            remark2 = #{remark2},
+        </if>
+        <if test="remark3 != null and remark3 != ''">
+            remark3 = #{remark3},
+        </if>
+        <if test="computerNo != null and computerNo != ''">
+            computer_no = #{computerNo},
+        </if>
+        <if test="reviewBy != null and reviewBy != ''">
+            review_by = #{reviewBy},
+        </if>
+        update_by_id = #{updateById},
+        update_time = #{updateTime}
+        WHERE
+            id = #{id}
+            AND del_flag = 0
+    </update>
+
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportSignatureMapper.xml

@@ -33,4 +33,29 @@
         cw_prs.status,
         cw_prs.process_definition_id
     </sql>
+
+    <select id="getInfoById" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReportSignature">
+        SELECT
+            id,
+            remarks,
+            report_id,
+            type,
+            proc_ins_id,
+            STATUS,
+            process_definition_id,
+            signature_annotator1_status,
+            signature_annotator2_status,
+            seal_admin_status,
+            create_time,
+            create_by_id,
+            update_time,
+            update_by_id,
+            del_flag,
+            tenant_id
+        FROM
+            cw_project_report_signature
+        WHERE
+            id = #{id}
+            AND del_flag = 0
+    </select>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProofreadDetailMapper.xml

@@ -50,4 +50,26 @@
 	<select id="getByTypeIdAndInfoId" resultType="com.jeeplus.finance.projectReport.domain.CwProofreadDetail">
 		select * from cw_proofread_detail where type_id = #{typeId} and info_id = #{infoId}
 	</select>
+
+	<update id="updateReportReviewInfoById">
+		UPDATE cw_proofread_detail
+		SET
+		<if test="infoId != null and infoId != ''">
+			info_id = #{infoId},
+		</if>
+		<if test="typeId != null and typeId != ''">
+			type_id = #{typeId},
+		</if>
+		<if test="reviewComments != null and reviewComments != ''">
+			review_comments = #{reviewComments},
+		</if>
+		<if test="tenantId != null and tenantId != ''">
+			tenant_id = #{tenantId},
+		</if>
+		update_by_id = #{updateById},
+		update_time = #{updateTime}
+		WHERE
+			id = #{id}
+			AND del_flag = 0
+	</update>
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportReviewService.java

@@ -310,15 +310,15 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                 report.setBusinessObjects(reportData.getBusinessObjects());
             }
             if (ObjectUtil.isNotEmpty(report)) {
-                cwProjectReportService.update(report, new QueryWrapper<CwProjectReport>().lambda().eq(CwProjectReport::getId,reportData.getId()));
+                cwProjectReportService.updateCwProjectReportDataById(report);
             }
         }
-        mapper.updateById(review);
+        mapper.updateReviewById(review);
         if ("5".equals(review.getReviewStatus())) {
             CwProjectRecords records = new CwProjectRecords();
             records.setId(reportData.getProjectId());
             records.setReportReview("1"); // 已开始报告复核
-            recordsMapper.updateById(records);
+            recordsMapper.updatereportReviewById(records);
         }
         //对复核数据进行持久化操作
         if (CollectionUtils.isNotEmpty(reportData.getDetails())) {
@@ -340,7 +340,7 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                     detail1.setInfoId(review.getId());
                     detail1.setUpdateById(userDTO.getId());
                     detail1.setUpdateTime(new Date());
-                    detailMapper.updateById(detail1);
+                    detailMapper.updateReportReviewInfoById(detail1);
                 }
             }
         }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -54,7 +54,9 @@ import org.flowable.bpmn.model.FlowNode;
 //import org.flowable.task.api.Task;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -66,6 +68,9 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
 
 /**
  * @author: 王强
@@ -73,17 +78,15 @@ import java.util.stream.Collectors;
  **/
 @Service
 @Transactional(rollbackFor = Exception.class)
+@Component
 public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, CwProjectReport> {
 
-    private static final String HTTPTOP = Global.getConfig("signature_http_top");
-    private static final String COMPANYROUNDSEALID = Global.getConfig("company_round_seal_id");
-    private static final String COMPANYROUNDSEALIDVERTICAL = Global.getConfig("company_round_seal_id_vertical");
-    private static final String COMPANYPARTIESSEALID = Global.getConfig("company_parties_seal_id");
-    private static final String APPROVALCATEGORYID = Global.getConfig("approval_category_id");
-    private static final String APPROVALYCCATEGORYID = Global.getConfig("approval_YC_category_id");
-    private static final String REPORTCATEGORYID = Global.getConfig("report_category_id");
-    private static final String REPORTYCCATEGORYID = Global.getConfig("report_YC_category_id");
-    private static final String JUDGEMENTCATEGORYID = Global.getConfig("judgement_category_id");
+    @Value("${signature_http_top}")
+    private static String HTTPTOP;
+    @Value("${approval_category_id}")
+    private static String APPROVALCATEGORYID;
+    @Autowired
+    private Environment environment;
 
     @Resource
     private CwProjectReportMapper reportMapper;
@@ -140,6 +143,17 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Resource
     private CwProjectRecordsService cwProjectRecordsService;
 
+
+    public String getApprovalCategoryId() {
+        return environment.getProperty("approval_category_id");
+        // 使用myProperty的值
+    }
+
+    public String getSignatureHttpTop() {
+        return environment.getProperty("signature_http_top");
+        // 使用myProperty的值
+    }
+
     /**
      * 保存项目以及其他相关信息
      * @param reportData
@@ -149,7 +163,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     public String saveForm(CwProjectReportData reportData) throws Exception{
         if (StringUtils.isNotEmpty(reportData.getId())){
 
-            CwProjectReport report = reportMapper.selectById(reportData.getId());
+            CwProjectReport report = reportMapper.getById(reportData.getId());
             if (report != null){
                 reportData.setCreateBy(reportData.getCreateBy());
                 return update(reportData);
@@ -171,7 +185,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         BeanUtils.copyProperties(reportData, report);
         report.setUpdateById(userDTO.getId());
         report.setUpdateTime(new Date());
-        reportMapper.updateById(report);
+        reportMapper.updateCwProjectReportDataById(report);
         //修改新增行数据
         CwProjectInfoData infoData = infoMapper.selectInfoByReportId(report.getId());
         infoData.setServedUnitName(report.getServedUnitName());
@@ -182,7 +196,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setServedUnitId(report.getServedUnitId());
         infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
-        infoMapper.updateById(infoData);
+        infoMapper.updateCwProjectInfoDataById(infoData);
 
         //对上传的文件数据进行持久化操作
         List<ProjectReportWorkAttachmentDTO> cwFileInfoList = report.getCwFileInfoList();
@@ -1930,8 +1944,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             }else{
                 path = "/attachment-file/";
             }
-            String aliyunUrl = Global.getAliyunUrl();
-            String aliDownloadUrl = Global.getAliDownloadUrl();
+            String aliyunUrl = "http://cdn.gangwaninfo.com";
+            String aliDownloadUrl = "http://oss.gangwaninfo.com";
 
             //获取文件生成的documentId
             List<String> documentList = Lists.newArrayList();
@@ -2256,7 +2270,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         SignatureContract signatureContract = new SignatureContract();
         signatureContract.setDocuments(documentList);
         //审定单用印流程id
-        signatureContract.setCategoryId(APPROVALCATEGORYID);
+        String approvalCategoryId = getApprovalCategoryId();
+        signatureContract.setCategoryId(approvalCategoryId);
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
@@ -2265,7 +2280,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         System.out.println(json.toString());
         long s5=System.currentTimeMillis();
         System.out.println(json.toString());
-        String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
+        String signatureHttpTop = getSignatureHttpTop();
+        String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(signatureHttpTop + "/contract/createbycategory", json.toString());
         long s6=System.currentTimeMillis();
         System.out.println("获取合同id获取时间：" + (s6 - s5));
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -2274,7 +2290,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     }
 
     public CwProjectReportData queryBySignatureId(String signatureId) {
-        CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.selectById(signatureId);
+        CwProjectReportSignature cwProjectReportSignature = cwProjectReportSignatureMapper.getInfoById(signatureId);
         if (ObjectUtil.isNotEmpty(cwProjectReportSignature)){
             if (StringUtils.isNotBlank(cwProjectReportSignature.getReportId())){
                 return this.queryById(cwProjectReportSignature.getReportId());
@@ -3062,4 +3078,10 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         return reportData;
     }
+
+    public void updateCwProjectReportDataById(CwProjectReport report){
+        if(StringUtils.isNotBlank(report.getId())){
+            reportMapper.updateCwProjectReportDataById(report);
+        }
+    }
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportAuditSheet/mapper/CwProofreadTypeMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.finance.projectReportAuditSheet.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.core.domain.TreeMapper;
 import com.jeeplus.finance.projectReport.domain.CwProofreadDetail;
@@ -13,7 +14,7 @@ import java.util.List;
  * @create: 2022-12-08 09:19
  **/
 public interface CwProofreadTypeMapper extends BaseMapper<CwProofreadType>, TreeMapper<CwProofreadType> {
-
+    @InterceptorIgnore(tenantLine = "true")
     List<CwProofreadDetail> prooList(@Param("type")String type);
 
     Integer checkNameIsExist(@Param("parentId")String parentId, @Param("name") String name, @Param("type")String type);

jeeplus-modules/jeeplus-finance/src/main/resources/bootstrap.yml

@@ -96,3 +96,32 @@ config:
 aliyun_directory: attachment-file/assess
 #签章阿里云文件bucketName
 qzBucketName: xg-qz
+
+#192.168.2.6签章测试参数
+apptoken: uIJQmTwyGJ
+appsecret: 2NMBqFigKoInmd43Wohxv5aEDKiiHo
+signature: 232a44ee9ebd251d119f0a65628f678e
+
+signature_http_top: http://192.168.2.130:9182
+#signature_http_top: https://3m0m810894.goho.co
+
+#竖版模板templateId
+vertical_templateId: 2894156236229259396
+#横板模板templateId
+across_templateId: 2894156210627227768
+#公司圆章
+company_round_seal_id: 2894161942659543252
+#公司圆章-竖
+company_round_seal_id_vertical: 2898043523878957918
+#公司方章
+company_parties_seal_id: 2894163220106129636
+#审定单用印流程id
+approval_category_id: 3032265972836684447
+#报告用印流程id
+report_category_id: 2895618951099527314
+##审定内用印流程id
+judgement_category_id: 2920938119742709765
+#审定单用印流程id(盐城)
+approval_YC_category_id: 2932214418853044239
+#报告用印流程id(盐城)
+report_YC_category_id: 2933233458312618324

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -31,6 +31,7 @@ public interface UserMapper extends BaseMapper <User> {
      * @param enName 角色名称
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List <UserDTO> getUserInfoByEnName(String enName);
 
     /**