jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -410,7 +410,7 @@ select
            FROM
                cw_project_report_archive AS arc
                    LEFT JOIN cw_finance_invoice_base AS base ON base.program_id = arc.report_id and base.del_flag = '0'
-                   LEFT JOIN cw_finance_invoice_base AS base1 ON base1.invoice_id = base.invoice_id and base1.del_flag = '0'
+                   LEFT JOIN cw_finance_invoice_base AS base1 ON base1.invoice_id = base.invoice_id and base1.del_flag = '0' and base1.program_name = base.program_name
                    LEFT JOIN cw_project_report_new_line AS line ON line.report_id = base1.program_id and line.del_flag = '0'
                    LEFT JOIN cw_finance_invoice AS invoice ON invoice.id = base1.invoice_id and invoice.del_flag = '0'
                    LEFT JOIN cw_finance_invoice_detail AS detail ON detail.invoice_id = invoice.id and detail.del_flag = '0'
@@ -427,7 +427,7 @@ SELECT
 FROM
     cw_project_report_archive AS arc
         LEFT JOIN cw_finance_invoice_base AS base ON base.program_id = arc.project_id and base.del_flag = '0'
-        LEFT JOIN cw_finance_invoice_base AS base1 ON base1.invoice_id = base.invoice_id and base1.del_flag = '0'
+        LEFT JOIN cw_finance_invoice_base AS base1 ON base1.invoice_id = base.invoice_id and base1.del_flag = '0' and base1.program_name = base.program_name
         LEFT JOIN cw_project_report_new_line AS line ON line.report_id = base1.program_id and line.del_flag = '0'
         LEFT JOIN cw_finance_invoice AS invoice ON invoice.id = base1.invoice_id and invoice.del_flag = '0'
         LEFT JOIN cw_finance_invoice_detail AS detail ON detail.invoice_id = invoice.id and detail.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/CwWorkClientService.java

@@ -81,6 +81,7 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
     public IPage<AuditFindDto> auditFindListBy(AuditFindDto auditFindDto, Page<AuditFindDto> page) throws Exception {
         QueryWrapper<AuditFindDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition (auditFindDto, AuditFindDto.class);
         queryWrapper.eq("arc.id", auditFindDto.getReportId());
+        queryWrapper.ne("record.audit_fees",0);
         IPage<AuditFindDto> list = cwWorkClientBaseMapper.auditFindListBy(page, queryWrapper);
         return list;
     }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -855,4 +855,15 @@ public class UserController {
         String path = "/"+year+"/"+month+"/"+day;
         return path;
     }
+
+    /**
+     * 查看签字注释2角色的用户
+     * @return
+     */
+    @ApiLog("签字注师2")
+    @GetMapping("list1")
+    public List<String> list1(){
+        String id= "1681920842985959425";
+        return userService.selectSignatureNaster(id);
+    }
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -248,4 +248,7 @@ public interface UserMapper extends BaseMapper<User> {
      * @return
      */
     Integer getAccountantUserCount(@Param("userId") String userId);
+
+
+    List<String> selectSignatureNaster(String id);
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -424,4 +424,13 @@
 		select count(id) from cw_project_report
 		where del_flag = 0 and (signature_annotator1 = #{userId} or signature_annotator2 = #{userId})
 	</select>
+	<select id="selectSignatureNaster" resultType="java.lang.String">
+
+	select
+	us.id
+	from sys_role as role
+	left join sys_user_role as user_role on user_role.role_id= role.id
+	left join sys_user as us on us.id= user_role.user_id
+	where  role.id = #{id}
+	</select>
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -599,4 +599,10 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 	public Integer getAccountantUserCount(String userId) {
 		return userMapper.getAccountantUserCount (userId);
 	}
+
+	public List<String> selectSignatureNaster(String id) {
+		List<String> list= userMapper.selectSignatureNaster(id);
+		return list;
+
+	}
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -324,4 +324,6 @@ public class  UserDTO extends BaseDTO {
      */
     private Integer accountantUserFlag;
 
+    private List<String> qz2;
+
 }