修改-查询Goals

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -1447,6 +1447,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         mktLeadsGoalsActions.setIsActive(1);
         mktLeadsGoalsActions.setIsActive(1);
         mktLeadsGoalsActions.setPractitionerId(practitionerId);
         mktLeadsGoalsActions.setPractitionerId(practitionerId);
         mktLeadsGoalsActions.setCurrentYear(year);
         mktLeadsGoalsActions.setCurrentYear(year);
+        mktLeadsGoalsActions.setGoalsType(goalsType);
         List<MktLeadsGoalsActions> mktLeadsGoalsActionsList = mktLeadsGoalsActionsDALService.findByMktLeadsGoalsActions(mktLeadsGoalsActions);
         List<MktLeadsGoalsActions> mktLeadsGoalsActionsList = mktLeadsGoalsActionsDALService.findByMktLeadsGoalsActions(mktLeadsGoalsActions);
         List<SalesTargetActions> salesTargetActions = new ArrayList<>();
         List<SalesTargetActions> salesTargetActions = new ArrayList<>();
         for (MktLeadsGoalsActions info : mktLeadsGoalsActionsList){
         for (MktLeadsGoalsActions info : mktLeadsGoalsActionsList){

yd-api/src/main/resources/mapper/marketing/MktLeadsGoalsActionsMapper.xml

@@ -254,6 +254,9 @@
         <if test="updatedBy != null">
         <if test="updatedBy != null">
           and updated_by = #{updatedBy,jdbcType=BIGINT}
           and updated_by = #{updatedBy,jdbcType=BIGINT}
         </if>
         </if>
+        <if test="goalsType != null">
+          and goals_type = #{goalsType,jdbcType=INTEGER}
+        </if>
       </where>
       </where>
     </select>
     </select>
 </mapper>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/marketing/MktLeadsGoalsMapper.xml

@@ -304,6 +304,15 @@
         <if test="updatedBy != null">
         <if test="updatedBy != null">
           and updated_by = #{updatedBy,jdbcType=BIGINT}
           and updated_by = #{updatedBy,jdbcType=BIGINT}
         </if>
         </if>
+        <if test="subordinateSystemId != null">
+          and subordinate_system_id = #{subordinateSystemId,jdbcType=BIGINT}
+        </if>
+        <if test="subordinateSystemName != null">
+          and subordinate_system_name = #{subordinateSystemName,jdbcType=VARCHAR}
+        </if>
+        <if test="goalsType != null">
+          and goals_type = #{goalsType,jdbcType=INTEGER}
+        </if>
       </where>
       </where>
     </select>
     </select>
 </mapper>
 </mapper>
\ No newline at end of file